Re: I broke git again

[Han-Wen Nienhuys]

Han-Wen Nienhuys escreveu:
> Graham Percival escreveu:
>> This was completely unintentional, please revert.
>> http://git.sv.gnu.org/gitweb/?p=lilypond.git;a=commit;h=3cac541f96771eb56fc4063df3d9a9ac765bc551
> 
> I think this is nothing to worry about. Gitweb shows a bogus patch
> when you're merging branches: It shows the diff of what happened in
> the other branch, in this case a couple of bugfixes by Jan and me.
> This has been fixed in recent revisions of Gitweb, IIRC.

if you want to prevent merges completely another option is to 
rebase your patches on the current master. That will produce less (bogus) 
merges, but is more work. I think the git-rebase manpage shows some 
examples.

 

-- 

Han-Wen Nienhuys - address@hidden - http://www.xs4all.nl/~hanwen

LilyPond Software Design
 -- Code for Music Notation
http://www.lilypond-design.com