git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: en/rebase-merge-on-sequencer, was Re: What's cooking in git.git (Nov 2018, #07; Fri, 30)

From
Elijah Newren <newren@gmail.com>
Date
Nov 30, 2018, 15:49 UTC
Message-ID
<CABPp-BF8RupyfP69iqAVTXxEhBGyzVd-wUgp3y0pf+CbBFAQeg@mail.gmail.com>
In-Reply-To
<xmqqpnumk604.fsf@gitster-ct.c.googlers.com>
On Fri, Nov 30, 2018 at 6:16 AM Junio C Hamano <gitster@pobox.com> wrote:
Show 39 quoted lines
>
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > Hi Junio,
> >
> > 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'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>

I've also got a reroll with an extra patch to address Duy's feedback, an extra patch to make a small documentation clarification/correction, and a fix to a typo in a commit message from the last roll. But I'm waiting for 2.20.0 to be released before sending it.

Previous: Johannes Schindelin
Message 5 of 5 in “What's cooking in git.git (Nov 2018, #07; Fri, 30)”
  1. Junio C HamanoNov 30, 2018
  2. en/rebase-merge-on-sequencer, was Re: What's cooking in git.git (Nov 2018, #07; Fri, 30)Johannes Schindelin, Nov 30, 2018
  3. Junio C HamanoNov 30, 2018
  4. Johannes SchindelinNov 30, 2018
  5. Elijah NewrenNov 30, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.