From: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
To: Patrick Welche <prlw1@cam•ac.uk>
Cc: git@vger•kernel.org
Subject: Re: 1.8.4 rebase regression?
Date: Mon, 16 Sep 2013 09:52:35 +0200 [thread overview]
Message-ID: <vpqsix5b3uk.fsf@anie.imag.fr> (raw)
In-Reply-To: <20130915235739.GA712@quark> (Patrick Welche's message of "Mon, 16 Sep 2013 00:57:39 +0100")
Patrick Welche <prlw1@cam•ac.uk> writes:
> 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/
next prev parent reply other threads:[~2013-09-16 7:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-15 23:57 1.8.4 rebase regression? Patrick Welche
2013-09-16 7:52 ` Matthieu Moy [this message]
2013-09-16 10:28 ` Patrick Welche
2013-09-16 11:18 ` Matthieu Moy
2013-09-17 7:15 ` Matthieu Moy
2013-09-17 9:15 ` Patrick Welche
2013-09-17 9:13 ` Patrick Welche
2013-09-17 9:23 ` Matthieu Moy
2013-09-17 10:07 ` Patrick Welche
2013-09-17 10:59 ` Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpqsix5b3uk.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp$(echo .)fr \
--cc=git@vger$(echo .)kernel.org \
--cc=prlw1@cam$(echo .)ac.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox