mirror of
https://github.com/git/git.git
synced 2024-11-06 09:13:01 +01:00
a7154e916c
The replacement was performed automatically by these commands: perl -pi -e 's/link:(git.+)\.html\[\1\]/gitlink:$1\[1\]/g' \ README Documentation/*.txt perl -pi -e 's/link:git\.html\[git\]/gitlink:git\[7\]/g' \ README Documentation/*.txt Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
34 lines
679 B
Text
34 lines
679 B
Text
git-merge-base(1)
|
|
=================
|
|
v0.1, May 2005
|
|
|
|
NAME
|
|
----
|
|
git-merge-base - Finds as good a common ancestor as possible for a merge
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-merge-base' <commit> <commit>
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
"git-merge-base" finds as good a common ancestor as possible. Given a
|
|
selection of equally good common ancestors it should not be relied on
|
|
to decide in any particular way.
|
|
|
|
The "git-merge-base" algorithm is still in flux - use the source...
|
|
|
|
|
|
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
|
|
---
|
|
Part of the gitlink:git[7] suite
|
|
|