Git cherry-pick syntax and merge branches

by

You have to supply -m if the commit is a merge commit, i.e. 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.

More Related Contents:

  1. What does cherry-picking a commit with Git mean?
  2. git cherry-pick says “…38c74d is a merge but no -m option was given”
  3. Who can help me in fixing the cherry-pick Git error? [closed]
  4. How to cherry-pick a range of commits and merge them into another branch?
  5. How can I selectively merge or pick changes from another branch in Git?
  6. How to cherry-pick multiple commits
  7. Git cherry pick and datamodel integrity
  8. Remove specific commit
  9. How to git-cherry-pick only changes to certain files?
  10. Partly cherry-picking a commit with Git
  11. Git Cherry-pick vs Merge Workflow
  12. git cherry-pick not working
  13. git – cherry-pick – HOWTO / WHYTO
  14. What Git branching models work for you?
  15. Is it possible to cherry-pick a commit from another git repository?
  16. Can I specify multiple users for myself in .gitconfig?
  17. How do I pull from a Git repository through an HTTP proxy?
  18. fatal: early EOF fatal: index-pack failed
  19. Rename master branch for both local and remote Git repositories
  20. git ahead/behind info between master and branch?
  21. GitHub “fatal: remote origin already exists”
  22. Repack of Git repository fails
  23. Is it possible to clone git config from remote location?
  24. When to use git subtree?
  25. You have not concluded your merge (MERGE_HEAD exists)
  26. Why Isn’t There A Git Clone Specific Commit Option?
  27. How can I undo a `git commit` locally and on a remote after `git push`
  28. Why does git revert complain about a missing -m option?
  29. Is there a way to compare two diffs or patches?
  30. How to temporarily disable git http proxy

Leave a Comment