27

I have two branch master and development

I need to get some commit id from development branch in master branch so I do it by cherry-pick but it shows me some error

$> git cherry-pick cf0d52b

error: Commit cf0d52b900f990300c3aa17936ddbae1476d461a is a merge but no -m option was given.
fatal: cherry-pick failed

I am not getting this error, why this error comes and how will I get rid of this.

Akash Jain
  • 766
  • 1
  • 8
  • 23
  • 4
    Possible duplicate of [git cherry-pick says "...38c74d is a merge but no -m option was given"](https://stackoverflow.com/questions/9229301/git-cherry-pick-says-38c74d-is-a-merge-but-no-m-option-was-given) – beat Aug 29 '17 at 08:08

4 Answers4

28

You are trying to cherry-pick a merge. A merge is build up from at several parents. You have to supply the parent id to the merge.

You have to supply any of the followings:

-m parent-number / --mainline parent-number

Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline.

This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent.

How to find out what are the commit parents?

Use the git show command to view the commit parents and then you can choose the parent index or the SHA-1

enter image description here

Community
  • 1
  • 1
CodeWizard
  • 92,491
  • 19
  • 110
  • 133
  • 1
    I still don't get how to find the parent number – Raphael Pinel Mar 19 '20 at 14:19
  • 10
    In the screenshot above there are 2 ids, d684a65 and d23e8e8, how to know which one refers to the branch I am on? – Raphael Pinel Mar 19 '20 at 14:21
  • 3
    In addition to @RaphaelPinel's answer, you can check the git log and check which branch holds the commit you want to cherry-pick. That commit should have one of the ID:s displayed under "Merge: ". Typically the command will then be: ```git cherry-pick -m 1 ``` – MikaelHalen Jul 27 '20 at 08:56
  • In addition to @RaphaelPinel and @MikaelHalen, ```git log --no-merges``` would be used to display commits without "merge hash"; for projects with along numbers of changes or merges this could be useful – Manuel Alanis Jan 25 '21 at 23:19
7

This option specifies the parent number (starting from 1)

Up until Git 2.13 (Q2 2017), that number could be 0! (which is incorrect)

See commit b16a991 (15 Mar 2017) by Jeff King (peff).
(Merged by Junio C Hamano -- gitster -- in commit 9c96637, 17 Mar 2017)

cherry-pick: detect bogus arguments to --mainline

The cherry-pick and revert commands use OPT_INTEGER() to parse --mainline. The stock parser is smart enough to reject non-numeric nonsense, but it doesn't know that parent counting starts at 1.

Worse, the value "0" is indistinguishable from the unset case, so a user who assumes the counting is 0-based will get a confusing message:

$ git cherry-pick -m 0 $merge
  error: commit ... is a merge but no -m option was given.

The correct diagnosis is that "-m 0" does not refer to the first parent ("-m 1" does).

VonC
  • 1,042,979
  • 435
  • 3,649
  • 4,283
2

Just as the Error suggest. You try to pick a merge commit, so you have tell git against which parent it should produce the diff that is then applied to the target.

Vampire
  • 31,050
  • 2
  • 58
  • 88
0

Try with git log --no-merges would be used to only display commits without "merge hash". For projects with along numbers of changes or merges this could be useful

Manuel Alanis
  • 151
  • 6