git merge --no-commit vs git cherry-pick --no-commit

git git-merge git-cherry-pick
whenov picture whenov · Dec 30, 2013 · Viewed 33.9k times · Source

Is there any difference between git merge --no-commit and git cherry-pick --no-commit?

And is there any difference in history if I commit after these two commands?

Answer

gturri picture gturri · Dec 30, 2013

If you commit after git merge --no-commit, you'll actually get a merge commit. Whereas after a git cherry-pick --no-commit you'll get a commit with a single parent.

Hence, yes, there is a difference between those two commands.

In particular if you have something like

A -- B -- C
 \        L HEAD
  \
   -- D -- E

If you cherry-pick commit E, you won't get modifications of commit D. Whereas if you merge, you'll get both.

Related questions

How can I selectively merge or pick changes from another branch in Git?

I'm using Git on a new project that has two parallel -- but currently experimental -- development branches: master: import of existing codebase plus a few modifications that I'm generally sure of exp1: experimental branch #1 exp2: experimental branch #2 exp1 and …

Read More
How to cherry pick a range of commits and merge into another branch?

I have the following repository layout: master branch (production) integration working What I want to achieve is to cherry pick a range of commits from the working branch and merge it into the integration branch. I pretty new to git …

Read More
Merge up to a specific commit

I created a new branch named newbranch from the master branch in git. Now I have done some work and want to merge newbranch to master; however, I have made some extra changes to newbranch and I want to merge …

Read More