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