Interactive rebase: using "pick" for merge commits

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



When I do an interactive rebase, and manually enter a "pick" with the
commit hash of a merge commit, I get the following confusing error message:

error: commit fa1afe1 is a merge but no -m option was given.
hint: Could not execute the todo command
hint:
hint:     pick fa1afe1 some subject
hint:
hint: It has been rescheduled; [rest of message snipped]

This error message makes it sound like I could somehow add "-m1" after
the "pick" to make it work (which is actually what I would like to be
able to do). I had to go read the source code to find out that that's
not the case, and the error message only comes from the fact that the
code is shared with the cherry-pick and revert commands, which do have
the -m option.

Is it crazy to want pick to work like this? Should it be supported?

-Stefan




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux