--stat::
Generate a diffstat instead of a patch.
+--summary::
+ Output a condensed summary of extended header information
+ such as creations, renames and mode changes.
+
--patch-with-stat::
Generate patch and prepend its diffstat.
</p>\r
</dd>\r
<dt>\r
+--summary\r
+</dt>\r
+<dd>\r
+<p>\r
+ Output a condensed summary of extended header information\r
+ such as creations, renames and mode changes.\r
+</p>\r
+</dd>\r
+<dt>\r
--patch-with-stat\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 16-Apr-2006 11:00:55 UTC\r
+Last updated 17-May-2006 10:33:59 UTC\r
</div>\r
</div>\r
</body>\r
</p>\r
</dd>\r
<dt>\r
+--summary\r
+</dt>\r
+<dd>\r
+<p>\r
+ Output a condensed summary of extended header information\r
+ such as creations, renames and mode changes.\r
+</p>\r
+</dd>\r
+<dt>\r
--patch-with-stat\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 16-Apr-2006 11:00:56 UTC\r
+Last updated 17-May-2006 10:34:00 UTC\r
</div>\r
</div>\r
</body>\r
</p>\r
</dd>\r
<dt>\r
+--summary\r
+</dt>\r
+<dd>\r
+<p>\r
+ Output a condensed summary of extended header information\r
+ such as creations, renames and mode changes.\r
+</p>\r
+</dd>\r
+<dt>\r
--patch-with-stat\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 16-Apr-2006 11:00:57 UTC\r
+Last updated 17-May-2006 10:34:01 UTC\r
</div>\r
</div>\r
</body>\r
</p>\r
</dd>\r
<dt>\r
+--summary\r
+</dt>\r
+<dd>\r
+<p>\r
+ Output a condensed summary of extended header information\r
+ such as creations, renames and mode changes.\r
+</p>\r
+</dd>\r
+<dt>\r
--patch-with-stat\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-May-2006 00:46:25 UTC\r
+Last updated 17-May-2006 10:34:02 UTC\r
</div>\r
</div>\r
</body>\r
<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
SYNOPSIS
--------
-'git-merge-base' <commit> <commit>
+'git-merge-base' [--all] <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.
+
+"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
------
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
<p><em>git-rebase</em> [--onto <newbase>] <upstream> [<branch>]</p>\r
-<p><em>git-rebase</em> --continue</p>\r
-<p><em>git-rebase</em> --abort</p>\r
+<p><em>git-rebase</em> --continue | --skip | --abort</p>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
not exist in the <upstream> branch.</p>\r
<p>It is possible that a merge failure will prevent this process from being\r
completely automatic. You will have to resolve any such merge failure\r
-and run <tt>git rebase --continue</tt>. If you can not resolve the merge\r
-failure, running <tt>git rebase --abort</tt> will restore the original <branch>\r
-and remove the working files found in the .dotest directory.</p>\r
+and run <tt>git rebase --continue</tt>. Another option is to bypass the commit\r
+that caused the merge failure with <tt>git rebase --skip</tt>. To restore the\r
+original <branch> and remove the .dotest working files, use the command\r
+<tt>git rebase --abort</tt> instead.</p>\r
<p>Note that if <branch> is not specified on the command line, the currently\r
checked out branch is used.</p>\r
<p>Assume the following history exists and the current branch is "topic":</p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-May-2006 07:27:57 UTC\r
+Last updated 17-May-2006 10:34:04 UTC\r
</div>\r
</div>\r
</body>\r
--------
'git-rebase' [--onto <newbase>] <upstream> [<branch>]
-'git-rebase' --continue
-
-'git-rebase' --abort
+'git-rebase' --continue | --skip | --abort
DESCRIPTION
-----------
It is possible that a merge failure will prevent this process from being
completely automatic. You will have to resolve any such merge failure
-and run `git rebase --continue`. If you can not resolve the merge
-failure, running `git rebase --abort` will restore the original <branch>
-and remove the working files found in the .dotest directory.
+and run `git rebase --continue`. Another option is to bypass the commit
+that caused the merge failure with `git rebase --skip`. To restore the
+original <branch> and remove the .dotest working files, use the command
+`git rebase --abort` instead.
Note that if <branch> is not specified on the command line, the currently
checked out branch is used.
</p>\r
</dd>\r
<dt>\r
+--branches\r
+</dt>\r
+<dd>\r
+<p>\r
+ Show branch refs found in <tt>$GIT_DIR/refs/heads</tt>.\r
+</p>\r
+</dd>\r
+<dt>\r
+--tags\r
+</dt>\r
+<dd>\r
+<p>\r
+ Show tag refs found in <tt>$GIT_DIR/refs/tags</tt>.\r
+</p>\r
+</dd>\r
+<dt>\r
+--remotes\r
+</dt>\r
+<dd>\r
+<p>\r
+ Show tag refs found in <tt>$GIT_DIR/refs/remotes</tt>.\r
+</p>\r
+</dd>\r
+<dt>\r
--show-prefix\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 10-Mar-2006 00:31:34 UTC\r
+Last updated 17-May-2006 10:34:04 UTC\r
</div>\r
</div>\r
</body>\r
--all::
Show all refs found in `$GIT_DIR/refs`.
+--branches::
+ Show branch refs found in `$GIT_DIR/refs/heads`.
+
+--tags::
+ Show tag refs found in `$GIT_DIR/refs/tags`.
+
+--remotes::
+ Show tag refs found in `$GIT_DIR/refs/remotes`.
+
--show-prefix::
When the command is invoked from a subdirectory, show the
path of the current directory relative to the top-level
projects / git.git / commitdiff