From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 09 Sep 2021 11:08:06 GMT
Subject: js/retire-preserve-merges, was Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)
Message-ID: <nycvar.QRO.7.76.6.2109091307070.59@tvgsbejvaqbjf.bet>
In-Reply-To: <xmqqsfyf5b74.fsf@gitster.g>

Hi Junio,

On Wed, 8 Sep 2021, Junio C Hamano wrote:

> * js/retire-preserve-merges (2021-09-07) 11 commits
>  - 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 'next'?

I think so, given the rate of reviews still trickling in tending toward
zero.

We probably want to keep it in `next` for quite a while, too, to make sure
that people get the memo.

Ciao,
Dscho