Git 挑选语法并合并分支

Question

So I have done countless cherry picks before and it seems that I must fail at life with this right now, I am trying to cherry pick from one branch to another which should be easy, how ever I get an error about it being a merge but not -m was given?

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

That looks wrong.......it should be:

$ git cherry-pick a8c5ad438f6173dc34f6ec45bddcef2ab23285e0

Since when do I have to supply a -m function?

Answer 1

You have to supply -m if the commit is a merge commit , ie a commit with more than one parent.

Normally, what git cherry-pick REV does can be described as:

1. Take the changes between rev and its parent.

2. Apply these changes to the current HEAD and commit the result with rev 's commit message.

A merge commit joins two lines of development. For example, one line implements widget, and the other line removes clutter. The merge gives you the code with the widget, sans the clutter.

Now consider step #1 of the cherry-pick process: git can't guess whether you want to remove the clutter or to implement the widget. Nor can you do both, because the information on how to do both is not contained inside a single merge commit, only the content of the resultant merged tree is.

The -m option allows you to tell git how to proceed. For example, if clutter removal happened on master and the merge commit was created using git merge WIDGET , then git cherry-pick -m 1 merged-commit will cherry-pick the new widget because diff between the merged tree and parent 1 (the last of clutter-removing commits) will have been exactly the widget addition. On the other hand, git cherry-pick -m 2 merge-commit will delete the clutter, because the difference between parent 2 (the last of the widget-adding commits) and merge-commit is exactly the clutter-removal missing from the widget branch.

Answer 2

The git is requesting you to specify parent number ( -m ), because your merge commit has two parents and git do not know which side of the merge should be considered the mainline. So using this option you can specify the parent number (starting from 1) of the mainline and cherry-pick in order to replay the change relative to the specified parent.

To find out your commit parents, try either:

git show --pretty=raw <merge_commit>

or:

git cat-file -p <merge_commit>

or even for better GUI visibility, try:

gitk <merge_commit>

As result, you should get something like:

commit fc70b1e9f940a6b511cbf86fe20293b181fb7821
tree 8d2ed6b21f074725db4f90e6aca1ebda6bc5d050 
parent 54d59bedb9228fbbb9d645b977173009647a08a9 = <parent1_commit>
parent 80f1016b327cd8482a3855ade89a41ffab64a792 = <parent2_commit>

Then check your each parent details by:

git show <parent1_or_2_commit>

^{Add --stat to see list of modified files.}

Or use the following command to compare the changes (based on the above parent):

git diff <parent1_or_2_commit>..<commit>

^{Add --stat to see list of modified files.}

or use the combined diff to compare the two parents by:

git diff --cc <parent1_commit>
git diff --cc <parent2_commit>

Then specify the parent number starting from 1 for your cherry-pick, eg

git cherry-pick -m 1 <merge_commit>

Then run git status to see what's going on. If you don't want to commit the changes yet, add -n option to see what happens. Then when you're not happy, reset to HEAD ( git reset HEAD --hard ). If you'll get git conflicts, you'll probably have to solve them manually or specify merge strategy ( -X ), see: How to resolve merge conflicts in Git?

Answer 3

就我个人而言，我通常做的是，由于合并合并了 2 个提交，例如，如果我有由 2 个父级组成的合并提交 C，例如在 master 中提交 A 并从另一个分支提交 B 被合并，如果我需要挑选合并我不会打扰令人困惑的命令来挑选合并提交本身，而是我只会分别挑选每个父母 A 和 B，这在您只想挑选提交 B 的情况下也很有帮助在合并发生之前，来自 master 的 case 提交 A 已经被挑选到了一个正在挑选的分支。

Answer 4

The syntax from the man pages is as follows:

git cherry-pick [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>...

The parent-number refers to:

-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.

So I would double check to make sure you have the correct commit hash. It might be that you want one that isn't from a merge but rather the commit before it. Otherwise, you need to use this flag and point to the correct side of the merge to disambiguate your request.

Answer 5

Try to merge result:

git cherry-pick ....
git mergetool
git cherry-pick --continue

Answer 6

parent1 commit change widget

parent2 commit change clutter

merge commit (contains both changes) widget clutter

git cherry-pick -m 1 merge-commit diff of merge and parent1(master) merge - master= widget

git cherry-pick -m 2 merge-commit diff of merge and parent2(WIDGET) merge - WIDGET= clutter