Re: en/rebase-merge-on-sequencer, was Re: What's cooking in git.git (Nov 2018, #07; Fri, 30)
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Nov 30, 2018, 15:22 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1811301621300.41@tvgsbejvaqbjf.bet>
- In-Reply-To
- <xmqqpnumk604.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Fri, 30 Nov 2018, Junio C Hamano wrote:
Show 23 quoted lines
> 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 ;-)
Show 12 quoted lines
> 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