]>
Commit | Line | Data |
---|---|---|
2cf565c5 DG |
1 | git-merge-base(1) |
2 | ================= | |
2cf565c5 DG |
3 | |
4 | NAME | |
5 | ---- | |
c3f0baac | 6 | git-merge-base - Find as good common ancestors as possible for a merge |
2cf565c5 DG |
7 | |
8 | ||
9 | SYNOPSIS | |
10 | -------- | |
2aa83961 | 11 | 'git-merge-base' [--all] <commit> <commit> |
2cf565c5 DG |
12 | |
13 | DESCRIPTION | |
14 | ----------- | |
2aa83961 FK |
15 | |
16 | "git-merge-base" finds as good a common ancestor as possible between | |
17 | the two commits. That is, given two commits A and B 'git-merge-base A | |
18 | B' will output a commit which is reachable from both A and B through | |
19 | the parent relationship. | |
20 | ||
21 | Given a selection of equally good common ancestors it should not be | |
22 | relied on to decide in any particular way. | |
2cf565c5 DG |
23 | |
24 | The "git-merge-base" algorithm is still in flux - use the source... | |
25 | ||
2aa83961 FK |
26 | OPTIONS |
27 | ------- | |
28 | --all:: | |
29 | Output all common ancestors for the two commits instead of | |
30 | just one. | |
2cf565c5 DG |
31 | |
32 | Author | |
33 | ------ | |
34 | Written by Linus Torvalds <torvalds@osdl.org> | |
35 | ||
36 | Documentation | |
37 | -------------- | |
38 | Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. | |
39 | ||
40 | GIT | |
41 | --- | |
5162e697 | 42 | Part of the linkgit:git[7] suite |