From: David Kastrup <dak@gnu.org>
To: git@vger.kernel.org
Subject: git rebase -p does not find mainline
Date: Fri, 28 Oct 2011 09:51:14 +0200 [thread overview]
Message-ID: <874nytlfkd.fsf@fencepost.gnu.org> (raw)
When doing git rebase -p in order to do a non-trivial rebase tracking
merges, I get a message about a missing -m option for specifying the
mainline.
git rebase does not have the corresponding option. The fix is to do
git cherry-pick -m 1 offending-merge-commit
git rebase --continue
but that is quite unobvious from the resulting error message that does
not even mention "cherry-pick". Since git rebase -p is supposed to
"preserve merges", it should just cherry-pick with the same mainline
that the original merge commit had, without asking the user questions or
even failing.
This is the version of git delivered with Ubuntu 11.10, namely 1.7.5.4.
--
David Kastrup
reply other threads:[~2011-10-28 7:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=874nytlfkd.fsf@fencepost.gnu.org \
--to=dak@gnu.org \
--cc=git@vger.kernel.org \
/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).