From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: en/rebase-merge-on-sequencer, was Re: What's cooking in git.git (Nov 2018, #07; Fri, 30)
Date: Fri, 30 Nov 2018 16:22:31 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1811301621300.41@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqpnumk604.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Fri, 30 Nov 2018, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > On Fri, 30 Nov 2018, Junio C Hamano wrote:
> >
> >> * en/rebase-merge-on-sequencer (2018-11-08) 2 commits
> >> - rebase: implement --merge via git-rebase--interactive
> >> - git-rebase, sequencer: extend --quiet option for the interactive machinery
> >>
> >> "git rebase --merge" as been reimplemented by reusing the internal
> >> machinery used for "git rebase -i".
> >
> > I *think* a new iteration has landed (which has 7 instead of 2 commits):
> > https://public-inbox.org/git/20181122044841.20993-1-newren@gmail.com/
>
> "Landed" as opposed to "be in-flight"?
>
> You got me worried by implying that I merged them to either 'master'
> or 'next' where it is harder to back out ;-).
>
> During the freeze, especially after -rc1, I stop paying attention to
> anything other than regression fixes and fixes to the addition since
> the previous releases, unless I have too much time and get bored and
> the new topic is trivial (which often means a single patch).
I thought so, but then I thought I had seen you commenting on the
(distinctly non-single patch distinctly non-regression fix)
`split-checkout-into-two-new-commands` patch series ;-)
> I'll mark the topic with the following, and continue ignoring it (or
> any other topics) for now. Thanks.
>
> * en/rebase-merge-on-sequencer (2018-11-08) 2 commits
> - rebase: implement --merge via git-rebase--interactive
> - git-rebase, sequencer: extend --quiet option for the interactive machinery
>
> "git rebase --merge" as been reimplemented by reusing the internal
> machinery used for "git rebase -i".
>
> Reroll exists.
> cf. <20181122044841.20993-1-newren@gmail.com>
Thank you, much appreciated.
Dscho
next prev parent reply other threads:[~2018-11-30 15:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-30 8:57 What's cooking in git.git (Nov 2018, #07; Fri, 30) Junio C Hamano
2018-11-30 13:31 ` en/rebase-merge-on-sequencer, was " Johannes Schindelin
2018-11-30 14:13 ` Junio C Hamano
2018-11-30 15:22 ` Johannes Schindelin [this message]
2018-11-30 15:49 ` Elijah Newren
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=nycvar.QRO.7.76.6.1811301621300.41@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--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.
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).