GIT – second try

Due to recent discussion on OpenEmbedded mailing list I decided to give GIT second chance (first one was few months ago).

I imported Poky using git-svn tool and started hacking. First work was switching to OPKG (described in other post). I created branch for it and changed bit after bit — result was patchset with 17 patches. I pushed them into official Subversion repository in a bit other order and as few less revisions. After that I dropped branch as not needed any more.

Next was creating few branches for local hacks. Merging branches is easy when there are no conflicts and require manual calling of git mergetool FILE (instead of that being called automatically). Cherry picker works very nice and “rebasing” branches recognize such revisions.

Nasty thing is that every change has to be committed before switching branches as there is only one “working copy” at time (not like in CVS, Subversion or Monotone where you need “working copy” per branch).

What do I feel about GIT now? I started to like it.

One thought on “GIT – second try

  1. bronson

    You can use “git stash” to stash away your changes and return your WD to a pristine state. Now go do something else. Finally, “git stash apply” will restore your changes to the WD, merging them as needed.

    It’s really handy. I’m liking git too…

Comments are closed.

No Trackbacks.