git cherry pick merge commit example