Revision 21e9757e31d136fad0c04f3ce9da11b8b128b4f2 authored by Alex Riesen on 01 August 2007, 12:57:43 UTC, committed by Junio C Hamano on 02 August 2007, 00:58:12 UTC
It wont work for arguments with special characters (like ", : or *).
It is generally not possible on Windows, so I didn't even try.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 96ffe89
Raw File
git-merge-base.txt
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 gitlink:git[7] suite
back to top