From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Elijah Newren <newren@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: js/retire-preserve-merges, was Re: What's cooking in git.git (Sep 2021, #03; Fri, 10)
Date: Mon, 13 Sep 2021 14:11:01 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2109131409530.55@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <CABPp-BGR3dfJE7TZ+jkjDdWyeXYowmJhtoFaQ8_Abn=ZROhB5Q@mail.gmail.com>
Hi Elijah & Junio,
On Sat, 11 Sep 2021, Elijah Newren wrote:
> 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
next prev parent reply other threads:[~2021-09-13 12:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-10 22:11 What's cooking in git.git (Sep 2021, #03; Fri, 10) Junio C Hamano
2021-09-11 17:27 ` Elijah Newren
2021-09-11 17:42 ` Ævar Arnfjörð Bjarmason
2021-09-11 21:38 ` Junio C Hamano
2021-09-13 12:11 ` Johannes Schindelin [this message]
2021-09-12 1:57 ` Taylor Blau
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=nycvar.QRO.7.76.6.2109131409530.55@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.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.
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).