Re: 1.8.4 rebase regression?

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Sep 16, 2013, 07:52 UTC
Message-ID: <vpqsix5b3uk.fsf@anie.imag.fr>
In-Reply-To: <20130915235739.GA712@quark>

Patrick Welche <prlw1@cam.ac.uk> writes:

Show 12 quoted lines

> I just upgraded (via pkgsrc) from git 1.8.3.4 to 1.8.4. With 1.8.4, I had
> local changes in glib, did a git pull --rebase. Some of my changes
> conflicted, but
>
> $ git rebase --abort
> No rebase in progress?
>
> so somehow the usual process of amending the edit, or skipping the patch
> no longer works.
>
> I found a similar report at:
> http://mail-index.netbsd.org/pkgsrc-users/2013/09/14/msg018646.html

Does the following patch fix this issue?

  https://github.com/git/git/commit/99855dd

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/