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

Viewed 38770

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?

2 Answers
Related