* git rebase -p does not find mainline
@ 2011-10-28 7:51 David Kastrup
0 siblings, 0 replies; only message in thread
From: David Kastrup @ 2011-10-28 7:51 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-10-28 7:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-28 7:51 git rebase -p does not find mainline David Kastrup
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).