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 (Oct 2021, #03; Mon, 11)

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Oct 14, 2021, 14:42 UTC
Message-ID
<nycvar.QRO.7.76.6.2110141641530.56@tvgsbejvaqbjf.bet>
In-Reply-To
<xmqqwnmgeenz.fsf@gitster.g>
Hi Junio,
On Wed, 13 Oct 2021, Junio C Hamano wrote:
Show 24 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
>
> > * 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 cook in 'next'.
>
> I am tempted to merge this down to 'master' soonish, in time for the
> next feature release that is planned to happen mid November.
>
> Opinions?

So far, I haven't heard any objections, so I'd be fin merging this soon-ish.

Ciao, Dscho

Previous: Junio C HamanoNext: Ævar Arnfjörð Bjarmason
Message 9 of 11 in “What's cooking in git.git (Oct 2021, #03; Mon, 11)”
  1. Junio C HamanoOct 12, 2021
  2. Submodules UX overhaul update (was: What's cooking in git.git (Oct 2021, #03; Mon, 11))Emily Shaffer, Oct 12, 2021
  3. Atharva RaykarOct 13, 2021
  4. ab/mark-leak-free-testsÆvar Arnfjörð Bjarmason, Oct 13, 2021
  5. ab/unpack-trees-leakfixÆvar Arnfjörð Bjarmason, Oct 13, 2021
  6. Ævar Arnfjörð BjarmasonOct 13, 2021
  7. ab/parse-options-cleanupÆvar Arnfjörð Bjarmason, Oct 13, 2021
  8. Junio C HamanoOct 13, 2021
  9. js/retire-preserve-merges, was Re: What's cooking in git.git (Oct 2021, #03; Mon, 11)Johannes Schindelin, Oct 14, 2021
  10. Ævar Arnfjörð BjarmasonOct 14, 2021
  11. Junio C HamanoOct 14, 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.