From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Phillip Wood <phillip.wood123@gmail.com>,
Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH v2 2/2] git-rebase.txt: highlight backend differences with commit rewording
Date: Wed, 11 Mar 2020 12:10:49 -0700 [thread overview]
Message-ID: <xmqqk13qhfly.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200311163643.GD27893@coredump.intra.peff.net> (Jeff King's message of "Wed, 11 Mar 2020 12:36:43 -0400")
Jeff King <peff@peff.net> writes:
> Thanks. With the earlier bug fix and this documentation change, I'm OK
> with keeping the merge-backend transition in v2.26.0. This change
> _might_ cause problems in somebody's script, but that will be true
> whether it comes in 2.26 or 2.27, and I think it's clear this is the end
> state we want to get to eventually.
I am OK either way, so let's take these two, plus the "don't i18n
the literals that must be given as option values" patch from Jiang,
and discard the "let's delay the inevitable to buy some time" patch.
I merged the last one locally to 'next' already but I haven't pushed
the result out, so it is still possible to back out ;-)
prev parent reply other threads:[~2020-03-11 19:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-11 5:13 [PATCH 0/2] Fix 2.26.0 rebase regression and documentation shortcoming Elijah Newren via GitGitGadget
2020-03-11 5:13 ` [PATCH 1/2] sequencer: clear CHERRY_PICK_HEAD upon dropping a become-empty commit Elijah Newren via GitGitGadget
2020-03-11 10:30 ` Phillip Wood
2020-03-11 18:38 ` Junio C Hamano
2020-03-11 19:27 ` Jeff King
2020-03-11 20:18 ` Junio C Hamano
2020-03-11 5:13 ` [PATCH 2/2] git-rebase.txt: highlight backend differences with commit rewording Elijah Newren via GitGitGadget
2020-03-11 15:30 ` [PATCH v2 0/2] Fix 2.26.0 rebase regression and documentation shortcoming Elijah Newren via GitGitGadget
2020-03-11 15:30 ` [PATCH v2 1/2] sequencer: clear state upon dropping a become-empty commit Elijah Newren via GitGitGadget
2020-03-11 16:34 ` Jeff King
2020-03-11 17:16 ` Elijah Newren
2020-03-11 19:33 ` Jeff King
2020-03-11 15:30 ` [PATCH v2 2/2] git-rebase.txt: highlight backend differences with commit rewording Elijah Newren via GitGitGadget
2020-03-11 16:36 ` Jeff King
2020-03-11 19:10 ` Junio C Hamano [this message]
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=xmqqk13qhfly.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=phillip.wood123@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).