2005-05-10 21:32:30 +00:00
|
|
|
git-merge-base(1)
|
|
|
|
|
=================
|
|
|
|
|
|
|
|
|
|
NAME
|
|
|
|
|
----
|
2007-01-18 23:53:37 +00:00
|
|
|
git-merge-base - Find as good common ancestors as possible for a merge
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
--------
|
2006-05-16 05:58:15 +00:00
|
|
|
'git-merge-base' [--all] <commit> <commit>
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
-----------
|
2006-05-16 05:58:15 +00:00
|
|
|
|
|
|
|
|
"git-merge-base" finds as good a common ancestor as possible between
|
|
|
|
|
the two commits. That is, given two commits A and B 'git-merge-base A
|
|
|
|
|
B' will output a commit which is reachable from both A and B through
|
|
|
|
|
the parent relationship.
|
|
|
|
|
|
|
|
|
|
Given a selection of equally good common ancestors it should not be
|
|
|
|
|
relied on to decide in any particular way.
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
|
The "git-merge-base" algorithm is still in flux - use the source...
|
|
|
|
|
|
2006-05-16 05:58:15 +00:00
|
|
|
OPTIONS
|
|
|
|
|
-------
|
|
|
|
|
--all::
|
|
|
|
|
Output all common ancestors for the two commits instead of
|
|
|
|
|
just one.
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
|
Author
|
|
|
|
|
------
|
|
|
|
|
Written by Linus Torvalds <torvalds@osdl.org>
|
|
|
|
|
|
|
|
|
|
Documentation
|
|
|
|
|
--------------
|
|
|
|
|
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
|
|
|
|
|
|
GIT
|
|
|
|
|
---
|
2005-09-19 10:10:51 +00:00
|
|
|
Part of the gitlink:git[7] suite
|
2005-05-10 21:32:30 +00:00
|
|
|
|
