git cherry pick merge commit from another branch