{"thread":{"id":"28782","subject":"git rebase -p does not find mainline","startedAt":"2011-10-28T07:51:14Z","lastAt":"2011-10-28T07:51:14Z","messageCount":1,"participants":["David Kastrup"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"178400","messageId":"874nytlfkd.fsf@fencepost.gnu.org","threadId":"28782","inReplyTo":null,"subject":"git rebase -p does not find mainline","fromName":"David Kastrup","fromEmail":"dak@gnu.org","sentAt":"2011-10-28T07:51:14Z","receivedAt":"2011-10-28T07:51:14Z","isPatch":false,"sender":{"key":"dak@gnu.org","avatar":"https://avatars.githubusercontent.com/u/52141349?v=4"},"body":"\nWhen doing git rebase -p in order to do a non-trivial rebase tracking\nmerges, I get a message about a missing -m option for specifying the\nmainline.\n\ngit rebase does not have the corresponding option.  The fix is to do\n\ngit cherry-pick -m 1 offending-merge-commit\ngit rebase --continue\n\nbut that is quite unobvious from the resulting error message that does\nnot even mention \"cherry-pick\".  Since git rebase -p is supposed to\n\"preserve merges\", it should just cherry-pick with the same mainline\nthat the original merge commit had, without asking the user questions or\neven failing.\n\nThis is the version of git delivered with Ubuntu 11.10, namely 1.7.5.4.\n\n-- \nDavid Kastrup\n"}]}