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

js/retire-preserve-merges, was Re: What's cooking in git.git (Sep 2021, #03; Fri, 10)

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Sep 13, 2021, 12:11 UTC
Message-ID
<nycvar.QRO.7.76.6.2109131409530.55@tvgsbejvaqbjf.bet>
In-Reply-To
<CABPp-BGR3dfJE7TZ+jkjDdWyeXYowmJhtoFaQ8_Abn=ZROhB5Q@mail.gmail.com>
Hi Elijah & Junio,
On Sat, 11 Sep 2021, Elijah Newren wrote:
Show 27 quoted lines
> On Fri, Sep 10, 2021 at 3:12 PM Junio C Hamano <gitster@pobox.com> wrote:
> >
> > --------------------------------------------------
> > [New Topics]
> >
> > * js/retire-preserve-merges (2021-09-07) 11 commits
> >   (merged to 'next' on 2021-09-10 at f645ffd7a3)
> >  + sequencer: restrict scope of a formerly public function
> >  + rebase: remove a no-longer-used function
> >  + rebase: stop mentioning the -p option in comments
> >  + rebase: remove obsolete code comment
> >  + rebase: drop the internal `rebase--interactive` command
> >  + git-svn: drop support for `--preserve-merges`
> >  + rebase: drop support for `--preserve-merges`
> >  + pull: remove support for `--rebase=preserve`
> >  + tests: stop testing `git rebase --preserve-merges`
> >  + remote: warn about unhandled branch.<name>.rebase values
> >  + t5520: do not use `pull.rebase=preserve`
> >
> >  The "--preserve-merges" option of "git rebase" has been removed.
> >
> >  Will merge to 'master'.
>
> I'm not objecting, but I'm kind of surprised to see this after your
> and Dscho's previous discussion at
> https://lore.kernel.org/git/xmqqv939uis8.fsf@gitster.g/; I thought
> it'd stay in next for a while.  Was this a mistake?

Oh, good catch! I would be very much in favor of cooking this until it is tender and ready for consumption.

Ciao, Dscho

Previous: Junio C HamanoNext: Taylor Blau
Message 5 of 6 in “What's cooking in git.git (Sep 2021, #03; Fri, 10)”
  1. Junio C HamanoSep 10, 2021
  2. Elijah NewrenSep 11, 2021
  3. Ævar Arnfjörð BjarmasonSep 11, 2021
  4. Junio C HamanoSep 11, 2021
  5. js/retire-preserve-merges, was Re: What's cooking in git.git (Sep 2021, #03; Fri, 10)Johannes Schindelin, Sep 13, 2021
  6. Taylor BlauSep 12, 2021

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.