git cherry pick range with merge commit