mirror of
https://github.com/git/git.git
synced 2024-11-05 16:52:59 +01:00
ba020ef5eb
The names of git commands are not meant to be entered at the
commandline; they are just names. So we render them in italics,
as is usual for command names in manpages.
Using
doit () {
perl -e 'for (<>) { s/\`(git-[^\`.]*)\`/'\''\1'\''/g; print }'
}
for i in git*.txt config.txt diff*.txt blame*.txt fetch*.txt i18n.txt \
merge*.txt pretty*.txt pull*.txt rev*.txt urls*.txt
do
doit <"$i" >"$i+" && mv "$i+" "$i"
done
git diff
.
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
42 lines
938 B
Text
42 lines
938 B
Text
git-merge-base(1)
|
|
=================
|
|
|
|
NAME
|
|
----
|
|
git-merge-base - Find as good common ancestors as possible for a merge
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git merge-base' [--all] <commit> <commit>
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
|
|
'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.
|
|
|
|
The 'git-merge-base' algorithm is still in flux - use the source...
|
|
|
|
OPTIONS
|
|
-------
|
|
--all::
|
|
Output all common ancestors for the two commits instead of
|
|
just one.
|
|
|
|
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 linkgit:git[1] suite
|