merging patches to origin

[Esben Mose Hansen]

On Saturday 08 May 2010 10:39:09 Bertjan Broeksema wrote:
> Imo, this should be prevented wherever possible (i.e. as least for normal 
> patches first committed locally). It will make it harder to find regression
> with  git bisect.

In my experience, merges don't interfere with git bisect. Be wary of rebase, 
because while you get a nice-looking tree, the rebased commits are likely 
untested and might not compile. So after you rebase, you would have to do

git checkout HEAD^
compile

until you get to origin/master, in order to be sure each commit still compiles 
(non-compiling commits do interfere with git bisect, though not fatally so).

Personally, I prefer the merges unless the change is completely trivial.

-- 
Kind regards, Esben