title: error: commit is a merge but no -m option was given
body: <p>when I do git cherry-pick, I got this error, how can I solve it?</p>
  
  <pre><code>$ git cherry-pick  XXXXXXXXXXXXX                                                                                                                                          
  error: commit XXXXXXXXXXXXX is a merge but no -m option was given.
  fatal: cherry-pick failed
  $ git cherry-pick
      -m, --mainline &lt;n&gt;    parent number
  $ git cherry-pick -m 1234 XXXXXXXXXXXXX
  $ error: commit XXXXXXXXXXXXX does not have parent 1234
  fatal: cherry-pick failed
  </code></pre>