Giters

danielbayerlein / git-pick

🍒 git cherry-pick <commit> to multiple branches

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

Support cherry-picks for merges

chrishelgert opened this issue · comments

commented

git cherry-pick have a flag "-m" for merging merge-commits.
git-pick currently doesn´t support cherry-pick merge-commits, please add support for this.
maybe with --merge | -m ? :)

commented

@chrishelgert I think it's not a good idea to cherry-pick a merge commit, see git cherry-pick --help

-m parent-number, --mainline parent-number
    Usually you cannot cherry-pick a merge because you do not know which
    side of the merge should be considered the mainline. This option
    specifies the parent number (starting from 1) of the mainline and
    allows cherry-pick to replay the change relative to the specified
    parent.

What do you think?

commented

yeah, we should think about squashing our commits before the merge, maybe bitbucket supports this anywhere?