Re: Bisection/merge commits

[David Kastrup]

Graham Percival <address@hidden> writes:

> On Thu, Oct 27, 2011 at 07:36:23AM +0200, David Kastrup wrote:
>> Can you figure out what steps you did for pushing staging to master,
>> perhaps using the reflog or other personal history?  I made sure that I
>> had a merge commit in staging for doing the tuning work.
>
> I copied&pasted from a previous email from you:
>
> git fetch
> git rebase origin/master origin/dev/staging
> ... make ; make doc ...
> git push origin HEAD:master

Great.  After digging through the docs, I found that rebase has an
option --preserve-merges that is not the default.

We would have needed that I guess.

> I have absolutely no objection to following a different set of
> commands.  And soon (hopefully later today) I'll have the exact
> commands uploaded to the lilypond-extra repository, so you can see
> beyond any shadow of a doubt what commands Patchy is running.

I think adding --preserve-merges should help.  The alternative is
--no-ff which refuses to do anything if master has separate commits.

-- 
David Kastrup