From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: js/retire-preserve-merges, was Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)
Date: Thu, 9 Sep 2021 13:08:06 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2109091307070.59@tvgsbejvaqbjf.bet> (raw)
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
next prev parent reply other threads:[~2021-09-09 11:08 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-08 15:38 What's cooking in git.git (Sep 2021, #02; Wed, 8) Junio C Hamano
2021-09-08 16:24 ` Taylor Blau
2021-09-08 19:23 ` Junio C Hamano
2021-09-09 1:02 ` Taylor Blau
2021-09-08 21:27 ` Jeff King
2021-09-08 16:55 ` Azeem Bande-Ali
2021-09-08 19:20 ` Junio C Hamano
2021-09-08 17:50 ` Philippe Blain
2021-09-08 21:57 ` Derrick Stolee
2021-09-09 14:23 ` Elijah Newren
2021-09-09 2:59 ` Ramsay Jones
2021-09-09 17:45 ` Junio C Hamano
2021-09-09 11:03 ` js/scalar, was " Johannes Schindelin
2021-09-10 8:52 ` Junio C Hamano
2021-09-09 11:05 ` rs/range-diff-avoid-segfault-with-I, " Johannes Schindelin
2021-09-09 11:08 ` Johannes Schindelin [this message]
2021-09-10 5:00 ` js/retire-preserve-merges, " Junio C Hamano
2021-09-09 11:08 ` mr/bisect-in-c-4, " Johannes Schindelin
2021-09-10 5:07 ` Junio C Hamano
2021-09-10 9:33 ` Johannes Schindelin
2021-09-09 11:13 ` lh/systemd-timers, " Johannes Schindelin
2021-09-09 11:15 ` ar/submodule-add-more, " Johannes Schindelin
2021-09-10 5:30 ` Junio C Hamano
2021-09-09 11:18 ` Ævar Arnfjörð Bjarmason
2021-09-09 14:12 ` Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2109091307070.59@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).