[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Bisection/merge commits
From: |
David Kastrup |
Subject: |
Re: Bisection/merge commits |
Date: |
Thu, 27 Oct 2011 08:50:06 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.90 (gnu/linux) |
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
- PATCH: Countdown to 20111027, Colin Campbell, 2011/10/26
- Re: PATCH: Countdown to 20111027, address@hidden, 2011/10/26
- Re: PATCH: Countdown to 20111027, Graham Percival, 2011/10/26
- Re: PATCH: Countdown to 20111027, Colin Campbell, 2011/10/26
- Re: PATCH: Countdown to 20111027, David Kastrup, 2011/10/26
- Re: PATCH: Countdown to 20111027, Graham Percival, 2011/10/26
- Re: PATCH: Countdown to 20111027, David Kastrup, 2011/10/26
- Re: PATCH: Countdown to 20111027, Graham Percival, 2011/10/26
- Bisection/merge commits (was: PATCH: Countdown to 20111027), David Kastrup, 2011/10/27
- Re: Bisection/merge commits (was: PATCH: Countdown to 20111027), Graham Percival, 2011/10/27
- Re: Bisection/merge commits,
David Kastrup <=
- Re: Bisection/merge commits, David Kastrup, 2011/10/27
- Re: Bisection/merge commits, Graham Percival, 2011/10/27