What are the differences between git cherry-pick and git show | patch -p1?

Question

I ran into a situation where git cherry-pick X would have some conflicts, but also created extra inserts (when verified with git diff).

I then

Answer 1

This might help:

http://technosophos.com/2009/12/04/git-cherry-picking-move-small-code-patches-across-branches.html

It might be partly off topic, but as you can see, cherry picking seems to track code blocks across the code in some way, much more advanced than what I would guess patch does, which is probably just parsing the two codebases sequentially and side by side, and mark lines that differ.