<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.1" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-merge-base</em> <commit> <commit></p>\r
+<p><em>git-merge-base</em> [--all] <commit> <commit></p>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>"git-merge-base" finds as good a common ancestor as possible. Given a\r
-selection of equally good common ancestors it should not be relied on\r
-to decide in any particular way.</p>\r
+<p>"git-merge-base" finds as good a common ancestor as possible between\r
+the two commits. That is, given two commits A and B <em>git-merge-base A\r
+B</em> will output a commit which is reachable from both A and B through\r
+the parent relationship.</p>\r
+<p>Given a selection of equally good common ancestors it should not be\r
+relied on to decide in any particular way.</p>\r
<p>The "git-merge-base" algorithm is still in flux - use the source…</p>\r
</div>\r
+<h2>OPTIONS</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+--all\r
+</dt>\r
+<dd>\r
+<p>\r
+ Output all common ancestors for the two commits instead of\r
+ just one.\r
+</p>\r
+</dd>\r
+</dl>\r
+</div>\r
<h2>Author</h2>\r
<div class="sectionbody">\r
<p>Written by Linus Torvalds <torvalds@osdl.org></p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:20 PDT\r
+Last updated 17-May-2006 10:34:03 UTC\r
</div>\r
</div>\r
</body>\r
projects / git.git / blobdiff