Git cherry pick a merge commit