git merge commit vs cherry pick