git cherry pick merge commit from one branch to another