Re:Distrusting git
by davvid on Saturday October 01, 2011 @01:37PM
(#3060553)
I believe you're describing "git rebase". e.g.
instead of:
which you can also do with:
But really, the preferred way is to use topic branches. So if you're on branch "foo", this is how you integrate into master.
That does create a merge commit but it does it in the right direction (master 1st parent, topic branch 2nd). You get to see the parallel development which is good to preserve in the history. Otherwise, rebasing is nice because it keeps the history linear.
[ Parent
| on HN ]