From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org, Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: What's cooking in git.git (Oct 2021, #03; Mon, 11)
Date: Wed, 13 Oct 2021 15:35:44 -0700 [thread overview]
Message-ID: <xmqqwnmgeenz.fsf@gitster.g> (raw)
In-Reply-To: <xmqqv9239k15.fsf@gitster.g> (Junio C. Hamano's message of "Mon, 11 Oct 2021 17:14:14 -0700")
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?
next prev parent reply other threads:[~2021-10-13 22:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-12 0:14 What's cooking in git.git (Oct 2021, #03; Mon, 11) Junio C Hamano
2021-10-12 22:07 ` Submodules UX overhaul update (was: What's cooking in git.git (Oct 2021, #03; Mon, 11)) Emily Shaffer
2021-10-13 5:20 ` Atharva Raykar
2021-10-13 13:28 ` ab/mark-leak-free-tests Ævar Arnfjörð Bjarmason
2021-10-13 13:33 ` ab/unpack-trees-leakfix Ævar Arnfjörð Bjarmason
2021-10-13 13:43 ` What's cooking in git.git (Oct 2021, #03; Mon, 11) Ævar Arnfjörð Bjarmason
2021-10-13 13:47 ` ab/parse-options-cleanup Ævar Arnfjörð Bjarmason
2021-10-13 22:35 ` Junio C Hamano [this message]
2021-10-14 14:42 ` js/retire-preserve-merges, was Re: What's cooking in git.git (Oct 2021, #03; Mon, 11) Johannes Schindelin
2021-10-14 15:50 ` Ævar Arnfjörð Bjarmason
2021-10-14 17:09 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqwnmgeenz.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).