Ruby China

Git Git 获取两个 branch/commit (分支 / 提交) 共同的祖先

ery · March 03, 2015 · Last by ery replied at March 09, 2015 · 9966 hits

当你做 CodeReview 的时候， 你需要知道，当前功能分支，到底做了那些变化。 当然 git diff 可以帮助你，但是和那个 commit diff 哪？ 因为当前功能分支，可能已经提交了很多新的 commit，你已经无法找到起点。

这个时候 git merge-base 可以帮助你。

用法如下：

git merge-base commit1 commit2

https://www.kernel.org/pub/software/scm/git/docs/git-merge-base.html

mogodb #1 March 07, 2015

默认为何没显示这个命令？

alixiaomiao #2 March 07, 2015

#1 楼 @mogodb

The most commonly used git commands are:

ery #3 March 07, 2015

#1 楼 @mogodb linux 下用 man git 可以看到该命令 早用 Linux 早解脱

mogodb #4 March 07, 2015

#2 楼 @alixiaomiao

好吧，我只能说用过少数命令 图标怎么搞出来的？

喜爱

foxzool #5 March 07, 2015

#4 楼 @mogodb

'>' markdown 的 blockquote

bcho #6 March 07, 2015

直接 diff master branch 不就可以了么……

ery #7 March 09, 2015

#6 楼 @bcho 

master : commit-1 -> commit-2 -> commit-3 -> commit-4 -> commit-5 -> commit-6
branch_xxx:                    -> commit-x3 -> commit-x4 

git diff master branch_xxx

等效于

git diff commit-6 commit-x4

而我在 code review 的时候，希望做以下的比较 

git diff commit-2 commit-x4
1 likes
You need to Sign in before reply, if you don't have an account, please Sign up first.