* Stefano Lattarini wrote on Sat, Aug 21, 2010 at 01:49:37PM CEST: > On Saturday 21 August 2010, Ralf Wildenhues wrote: > > FWIW, somehow you managed to apply these two patches separately to > > each of these branches, instead of merging them all from maint. > Ouch, that's true... how could this be possible? I cannot immagine > what error I might have done to cause this mess... Do you have > idea? I'd like to avoid such blunders in the future, and a possible > explanation of the present blunder might be helpful in this regard.
Maybe you invoked 'git rebase' across a merge commit? That effectively removes the merge and duplicates the previously-merged commits, unless you use -p aka. --preserve-merges. I've never tried -p. > Sorry for all this, It's no big deal at all, esp. since you're doing the work. I just wanted to make you aware of it. Cheers, Ralf
