git cherry picking merge commit