From: Philippe Blain <levraiphilippeblain@gmail.com>
To: Git mailing list <git@vger.kernel.org>
Cc: "Eric Sunshine" <sunshine@sunshineco.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Denton Liu" <liu.denton@gmail.com>,
"Jonathan Tan" <jonathantanmy@google.com>,
"Elijah Newren" <newren@gmail.com>
Subject: [RFC] should `git rebase --keep-base` imply `--reapply-cherry-picks` ?
Date: Mon, 13 Jul 2020 22:44:06 -0400 [thread overview]
Message-ID: <0EA8C067-5805-40A7-857A-55C2633B8570@gmail.com> (raw)
Hello,
I learned today that doing `git rebase --keep-base master`
will drop commits that were cherry-picked from master to the current branch.
I was simply doing a code clean up on my feature branch (the full command was
`git rebase -i --keep-base master`), and this kind of confused me for a moment.
Is this a sane default ? I understand that it is a good default when we are rebasing
*on top* of master, but here I'm just doing some squashing and fixup's and I did not
want the commit I had cherry-picked from master to disappear (yet). In fact, because it
was dropped, it created a modify/delete conflict because in a subsequent commit
in my feature branch I'm modifying files that are added in the commit I cherry-picked.
How would a change that made '--reapply-cherry-picks' be the default when using 'keep-base'
be received ?
Tangential question: in any case, would it make sense to still add the "dropped because
already upstream" commits to the todo list, in the case of an interactive rebase ?
(maybe commented out, or listed as 'drop' with some kind of comment saying those
are dropped because they appear textually upstream?)
Cheers,
Philippe.
P.S. I CC'd those who were involved with the 'keep-base' patch or the 'reapply-cherry-picks' patch.
next reply other threads:[~2020-07-14 2:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 2:44 Philippe Blain [this message]
2020-07-14 3:10 ` [RFC] should `git rebase --keep-base` imply `--reapply-cherry-picks` ? Denton Liu
2020-07-14 3:51 ` Jonathan Tan
2020-07-15 3:32 ` Denton Liu
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=0EA8C067-5805-40A7-857A-55C2633B8570@gmail.com \
--to=levraiphilippeblain@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=liu.denton@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).