git merge-base

名字: git-merge-base

找到一个merge中尽可能好的公共祖先。

语法:

'git merge-base' [-a|--all] <commit> <commit>...
'git merge-base' [-a|--all] --octopus <commit>...
'git merge-base' --is-ancestor <commit> <commit>
'git merge-base' --independent <commit>...
'git merge-base' --fork-point <ref> [<commit>]

描述:

git merge finds best common ancestors(s) between two commits to use in a three-way merge.

git merge-base找到两个commit之间最好的公共祖先。这个公共祖先会被用来做三方merge。