From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH v3 0/1] Teach the builtin rebase about the builtin interactive rebase
Date: Fri, 12 Oct 2018 09:59:51 +0200 (DST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1810120957480.45@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqy3bavdmk.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Sun, 7 Oct 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
>
> > Note: while this patch targets pk/rebase-in-c-6-final, it will not work
> > correctly without ag/rebase-i-in-c. So my suggestion is to rewrite the
> > pk/rebas-in-c-6-final branch by first merging ag/rebase-i-in-c, then
> > applying this here patch, and only then cherry-pick "rebase: default to
> > using the builtin rebase".
>
> Is this a stale comment in the context of v3, where we pretty much
> know how the resulting topic should intertwine with other topics? I
> am trying to see if I have do to anything differently this time, or
> just replacing the single commit while keeping the structure around
> that commit the same is fine.
Just replacing the single commit. For technical reasons, I still have to
target pk/rebase-in-c-6-final in my branch.
> Also, I see there is a new iteration v8 of ag/rebase-i-in-c on the
> list, sent on Sep 27th (you were CC'ed but I suspect it was before
> you came back). Are you happy with that update?
To be quite honest, I did not yet have time to look over it, but I
verified that it has my suggested fix for the -S option.
Ciao,
Dscho
prev parent reply other threads:[~2018-10-12 7:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-22 21:35 [PATCH 0/1] Teach the builtin rebase about the builtin interactive rebase Johannes Schindelin via GitGitGadget
2018-08-22 21:35 ` [PATCH 1/1] builtin rebase: prepare for builtin rebase -i Johannes Schindelin via GitGitGadget
2018-08-22 21:50 ` [PATCH 0/1] Teach the builtin rebase about the builtin interactive rebase Junio C Hamano
2018-08-23 2:48 ` Jonathan Nieder
2018-08-25 23:46 ` Johannes Schindelin
2018-08-27 17:48 ` Junio C Hamano
2018-08-28 12:53 ` Johannes Schindelin
2018-08-28 15:34 ` Junio C Hamano
2018-08-29 13:24 ` Johannes Schindelin
2018-08-28 17:17 ` Jonathan Nieder
2018-08-29 14:29 ` Johannes Schindelin
2018-08-29 14:31 ` [PATCH v2 " Johannes Schindelin via GitGitGadget
2018-08-29 14:31 ` [PATCH v2 1/1] builtin rebase: prepare for builtin rebase -i Johannes Schindelin via GitGitGadget
2018-08-29 22:40 ` Junio C Hamano
2018-08-30 11:03 ` Johannes Schindelin
2018-08-30 20:09 ` Jeff King
2018-08-31 20:38 ` Johannes Schindelin
2018-08-31 20:48 ` Jeff King
2018-10-05 15:54 ` [PATCH v3 0/1] Teach the builtin rebase about the builtin interactive rebase Johannes Schindelin via GitGitGadget
2018-10-05 15:54 ` [PATCH v3 1/1] builtin rebase: prepare for builtin rebase -i Johannes Schindelin via GitGitGadget
2018-10-06 23:50 ` [PATCH v3 0/1] Teach the builtin rebase about the builtin interactive rebase Junio C Hamano
2018-10-12 7:59 ` Johannes Schindelin [this message]
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=nycvar.QRO.7.76.6.1810120957480.45@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.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.
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).