From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Ralf Thielow <ralf.thielow@gmail.com>
Cc: Dennis Kaarsemaker <dennis@kaarsemaker.net>,
git <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2] rebase -i: improve advice on bad instruction lines
Date: Fri, 9 Sep 2016 14:21:45 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.20.1609091421010.129229@virtualbox> (raw)
In-Reply-To: <CAN0XMO+diDLXUrxjNGnUi6oUEwkcGavEX8vyGWy2+Wju-N4WJQ@mail.gmail.com>
Hi Ralf,
On Wed, 7 Sep 2016, Ralf Thielow wrote:
> 2016-09-07 11:28 GMT+02:00 Dennis Kaarsemaker <dennis@kaarsemaker.net>:
> > Hi Ralf,
> >
> > There are quite a few patch series in flight these days around
> > interactive rebase. Have you checked for conflicts with those?
> >
>
> Thanks. I did not check against 'pu' when I created this patch but I'm able
> to apply without any conflicts.
Yeah, rewrites in C won't conflict with your patches. If you rebase
interactively, the worst that will happen is that you update code that was
moved into contrib/...
Ciao,
Johannes
next prev parent reply other threads:[~2016-09-09 12:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-06 18:08 [PATCH] rebase -i: improve advice on bad instruction lines Ralf Thielow
2016-09-06 18:50 ` Ralf Thielow
2016-09-06 18:59 ` [PATCH v2] " Ralf Thielow
2016-09-07 9:28 ` Dennis Kaarsemaker
2016-09-07 17:07 ` Ralf Thielow
2016-09-09 12:21 ` Johannes Schindelin [this message]
2016-09-07 18:58 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.20.1609091421010.129229@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=dennis@kaarsemaker.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ralf.thielow@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).