From: Denton Liu <liu.denton@gmail.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: levraiphilippeblain@gmail.com, git@vger.kernel.org,
sunshine@sunshineco.com, avarab@gmail.com,
Johannes.Schindelin@gmx.de, newren@gmail.com
Subject: Re: [RFC] should `git rebase --keep-base` imply `--reapply-cherry-picks` ?
Date: Tue, 14 Jul 2020 23:32:16 -0400 [thread overview]
Message-ID: <20200715033216.GA11770@generichostname> (raw)
In-Reply-To: <20200714035104.1465772-1-jonathantanmy@google.com>
On Mon, Jul 13, 2020 at 08:51:04PM -0700, Jonathan Tan wrote:
> > > How would a change that made '--reapply-cherry-picks' be the default when using 'keep-base'
> > > be received ?
> >
> > I'm somewhat surprised that --no-reapply-cherry-picks is the default. I
> > would argue that it _shouldn't_ be the default at all. It's an
> > optimisation for when no --onto or --keep-base are specified but it
> > definitely can cause problems otherwise, as we've seen.
>
> When I encountered this feature, it was a surprise to me too, but this
> has been documented as a feature for a long time (e.g. see the man page
> for 2.1.4 from 2014 [2] - search for "RECOVERING FROM UPSTREAM REBASE").
>
> [2] https://git-scm.com/docs/git-rebase/2.1.4
Ah, I was mistaken. Thanks for the correction.
next prev parent reply other threads:[~2020-07-15 3:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 2:44 [RFC] should `git rebase --keep-base` imply `--reapply-cherry-picks` ? Philippe Blain
2020-07-14 3:10 ` Denton Liu
2020-07-14 3:51 ` Jonathan Tan
2020-07-15 3:32 ` Denton Liu [this message]
2020-07-14 9:52 ` Phillip Wood
2020-07-14 20:38 ` Johannes Schindelin
2020-07-15 3:20 ` Denton Liu
2020-07-15 8:53 ` Phillip Wood
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=20200715033216.GA11770@generichostname \
--to=liu.denton@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=levraiphilippeblain@gmail.com \
--cc=newren@gmail.com \
--cc=sunshine@sunshineco.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).