This reply is a bit late but... You're not supposed to do work on the same feature after a merge. I'm not advocating pulling master (or whatever the base branc

This reply is a bit late but... You're not supposed to do work on the same feature after a merge. I'm not advocating pulling master (or whatever the base branch is) often and merging whenever, so that you end up with loads of pointless merges. Once your feature is done, you merge once. This makes point 3 pretty much moot, since bisect handles merges just fine. Sometimes you need to update your code on top of a new base because of some important bugfix or something, and then it's fine to rebase, but I don't think it should be the default. I'll accept point 2, though I think git's merging is good enough that it's not noticeable in most cases. If you rebase you also lose information about the conflicts which may be undesirable. Someone might want to review your merge to see if you have solved the conflicts correctly.