[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 09:14:10 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.90 (gnu/linux)

David Kastrup <address@hidden> writes:

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

P.S.: After thinking about it, I decided I don't want to try to fix this
part of the history.  If my playing around with dev/staging is any
indication, I could do a non-fastforwarding fix (and only those can
remove the disruptive commit) only by deleting and recreating master,
given the current repository settings.

I am not going to take the chance that any metadata in connection with
master will get dropped by git when I delete master.

In future, rebase using --preserve-merges, and sorry for not noticing
this earlier.

David Kastrup

reply via email to

[Prev in Thread] Current Thread [Next in Thread]