From: Patrick Welche <prlw1@cam.ac.uk>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: git@vger.kernel.org
Subject: Re: 1.8.4 rebase regression?
Date: Mon, 16 Sep 2013 11:28:32 +0100 [thread overview]
Message-ID: <20130916102832.GB489@quark> (raw)
In-Reply-To: <vpqsix5b3uk.fsf@anie.imag.fr>
On Mon, Sep 16, 2013 at 09:52:35AM +0200, Matthieu Moy wrote:
> 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
Yes thanks!
CONFLICT (content): Merge conflict in glib/gmain.c
Failed to merge in the changes.
:-)
Any thoughts of the cosmetic ESC[31m change?
Cheers,
Patrick
next prev parent reply other threads:[~2013-09-16 10:28 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
2013-09-16 10:28 ` Patrick Welche [this message]
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=20130916102832.GB489@quark \
--to=prlw1@cam.ac.uk \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).