merging patches to origin

[Bertjan Broeksema]

Hi all,

I see that the public repository gets some merge commits like this one from 
Hamish: 41a99933719945ff84abc4d7587736be401a5d23

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.

There is a relative easy way to prevent this. When starting a new patch, 
create a local branch i.e. local. Then:

1) git checkout local
2) make modifications
3) git checkout master
4) git pull // First update master to get latest changes from origin
5) git rebase local
5b) eventually fix conflicts
6) git push

Step 5 will replay your changes in the local branch on master. Resulting in 
one line of changes for master.

Hope this is helpful.

Cheers,

Bertjan