Re: [PATCH v6 3/3] rebase: add a config option for --rebase-merges

From: Alex Henrie <alexhenrie24@gmail.com>
Date: Mar 12, 2023, 21:03 UTC
Message-ID: <CAMMLpeSYYDX2Jjet0wZFuMtpq03QZYHNr310-pHp8BsJ=izL_w@mail.gmail.com>
In-Reply-To: <kl6l7cvsi006.fsf@chooglen-macbookpro.roam.corp.google.com>

On Tue, Mar 7, 2023 at 5:02 PM Glen Choo <chooglen@google.com> wrote:

>
> Alex Henrie <alexhenrie24@gmail.com> writes:

Show 10 quoted lines

> > +test_expect_success '--rebase-merges="" is deprecated' '
> > +     git rebase --rebase-merges="" HEAD^ 2>actual &&
> > +     grep deprecated actual
> > +'
>
> I believe this used to be on 2/3, i.e.
>
>   https://lore.kernel.org/git/20230225180325.796624-3-alexhenrie24@gmail.com/
>
> but your cover letter suggests that it was removed. Mechanical error?

I removed it from the second patch but accidentally added it back in the third patch. Thanks for catching that.

-Alex

$ 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.