Autogenerated HTML docs for v1.5.0.3-289-gba66

diff --git a/git-diff.html b/git-diff.html
index 0a45472fa915914bd3c46b9afa106bd94c6e69fa..8390e23b52878e641b0991cf23a3759b5687cf84 100644 (file)
--- a/git-diff.html
+++ b/git-diff.html
@@ -272,7 +272,7 @@ git-diff(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-diff</em> [ --diff-options ] &lt;commit&gt;{0,2} [--] [&lt;path&gt;&#8230;]</p>\r
+<p><em>git-diff</em> [&lt;common diff options&gt;] &lt;commit&gt;{0,2} [--] [&lt;path&gt;&#8230;]</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -842,7 +842,7 @@ output diff in reverse.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 28-Feb-2007 08:13:33 UTC\r
+Last updated 06-Mar-2007 09:58:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff.txt b/git-diff.txt
index 12a531d1e9e4a7382f017ac303203e20abf47f2f..044cee9b425bedc7addd9a4418b553557902711b 100644 (file)
--- a/git-diff.txt
+++ b/git-diff.txt
@@ -8,7 +8,7 @@ git-diff - Show changes between commits, commit and working tree, etc
 
 SYNOPSIS
 --------
-'git-diff' [ --diff-options ] <commit>{0,2} [--] [<path>...]
+'git-diff' [<common diff options>] <commit>{0,2} [--] [<path>...]
 
 DESCRIPTION
 -----------

diff --git a/git-format-patch.html b/git-format-patch.html
index 7c1d2875d83e8b5cbc68176412fd99972029cc74..f1bdd8d4f21f872c7968773b32a80120eb835a35 100644 (file)
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -273,8 +273,8 @@ git-format-patch(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git-format-patch</em> [-n | -k] [-o &lt;dir&gt; | --stdout] [--attach] [--thread]\r
-                   [-s | --signoff] [--diff-options] [--start-number &lt;n&gt;]\r
+<div class="content"><em>git-format-patch</em> [&lt;common diff options&gt;] [-n | -k] [-o &lt;dir&gt; | --stdout]\r
+                   [--attach] [--thread] [-s | --signoff] [--start-number &lt;n&gt;]\r
                    [--in-reply-to=Message-Id] [--suffix=.&lt;sfx&gt;]\r
                    [--ignore-if-in-upstream]\r
                    &lt;since&gt;[..&lt;until&gt;]</div></div>\r
@@ -306,6 +306,361 @@ reference.</p>
 <div class="sectionbody">\r
 <dl>\r
 <dt>\r
+-p\r
+</dt>\r
+<dd>\r
+<p>\r
+        Generate patch (see section on generating patches)\r
+</p>\r
+</dd>\r
+<dt>\r
+-u\r
+</dt>\r
+<dd>\r
+<p>\r
+        Synonym for "-p".\r
+</p>\r
+</dd>\r
+<dt>\r
+--raw\r
+</dt>\r
+<dd>\r
+<p>\r
+        Generate the raw format.\r
+</p>\r
+</dd>\r
+<dt>\r
+--patch-with-raw\r
+</dt>\r
+<dd>\r
+<p>\r
+        Synonym for "-p --raw".\r
+</p>\r
+</dd>\r
+<dt>\r
+--stat[=width[,name-width]]\r
+</dt>\r
+<dd>\r
+<p>\r
+        Generate a diffstat.  You can override the default\r
+        output width for 80-column terminal by "--stat=width".\r
+        The width of the filename part can be controlled by\r
+        giving another width to it separated by a comma.\r
+</p>\r
+</dd>\r
+<dt>\r
+--numstat\r
+</dt>\r
+<dd>\r
+<p>\r
+        Similar to --stat, but shows number of added and\r
+        deleted lines in decimal notation and pathname without\r
+        abbreviation, to make it more machine friendly.  For\r
+        binary files, outputs two <tt>-</tt> instead of saying\r
+        <tt>0 0</tt>.\r
+</p>\r
+</dd>\r
+<dt>\r
+--shortstat\r
+</dt>\r
+<dd>\r
+<p>\r
+        Output only the last line of the --stat format containing total\r
+        number of modified files, as well as number of added and deleted\r
+        lines.\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
+<p>\r
+        Synonym for "-p --stat".\r
+</p>\r
+</dd>\r
+<dt>\r
+-z\r
+</dt>\r
+<dd>\r
+<p>\r
+        \0 line termination on output\r
+</p>\r
+</dd>\r
+<dt>\r
+--name-only\r
+</dt>\r
+<dd>\r
+<p>\r
+        Show only names of changed files.\r
+</p>\r
+</dd>\r
+<dt>\r
+--name-status\r
+</dt>\r
+<dd>\r
+<p>\r
+        Show only names and status of changed files.\r
+</p>\r
+</dd>\r
+<dt>\r
+--color\r
+</dt>\r
+<dd>\r
+<p>\r
+        Show colored diff.\r
+</p>\r
+</dd>\r
+<dt>\r
+--no-color\r
+</dt>\r
+<dd>\r
+<p>\r
+        Turn off colored diff, even when the configuration file\r
+        gives the default to color output.\r
+</p>\r
+</dd>\r
+<dt>\r
+--color-words\r
+</dt>\r
+<dd>\r
+<p>\r
+        Show colored word diff, i.e. color words which have changed.\r
+</p>\r
+</dd>\r
+<dt>\r
+--no-renames\r
+</dt>\r
+<dd>\r
+<p>\r
+        Turn off rename detection, even when the configuration\r
+        file gives the default to do so.\r
+</p>\r
+</dd>\r
+<dt>\r
+--check\r
+</dt>\r
+<dd>\r
+<p>\r
+        Warn if changes introduce trailing whitespace\r
+        or an indent that uses a space before a tab.\r
+</p>\r
+</dd>\r
+<dt>\r
+--full-index\r
+</dt>\r
+<dd>\r
+<p>\r
+        Instead of the first handful characters, show full\r
+        object name of pre- and post-image blob on the "index"\r
+        line when generating a patch format output.\r
+</p>\r
+</dd>\r
+<dt>\r
+--binary\r
+</dt>\r
+<dd>\r
+<p>\r
+        In addition to --full-index, output "binary diff" that\r
+        can be applied with "git apply".\r
+</p>\r
+</dd>\r
+<dt>\r
+--abbrev[=&lt;n&gt;]\r
+</dt>\r
+<dd>\r
+<p>\r
+        Instead of showing the full 40-byte hexadecimal object\r
+        name in diff-raw format output and diff-tree header\r
+        lines, show only handful hexdigits prefix.  This is\r
+        independent of --full-index option above, which controls\r
+        the diff-patch output format.  Non default number of\r
+        digits can be specified with --abbrev=&lt;n&gt;.\r
+</p>\r
+</dd>\r
+<dt>\r
+-B\r
+</dt>\r
+<dd>\r
+<p>\r
+        Break complete rewrite changes into pairs of delete and create.\r
+</p>\r
+</dd>\r
+<dt>\r
+-M\r
+</dt>\r
+<dd>\r
+<p>\r
+        Detect renames.\r
+</p>\r
+</dd>\r
+<dt>\r
+-C\r
+</dt>\r
+<dd>\r
+<p>\r
+        Detect copies as well as renames.\r
+</p>\r
+</dd>\r
+<dt>\r
+--diff-filter=[ACDMRTUXB*]\r
+</dt>\r
+<dd>\r
+<p>\r
+        Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),\r
+        Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their\r
+        type (mode) changed (<tt>T</tt>), are Unmerged (<tt>U</tt>), are\r
+        Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).\r
+        Any combination of the filter characters may be used.\r
+        When <tt>*</tt> (All-or-none) is added to the combination, all\r
+        paths are selected if there is any file that matches\r
+        other criteria in the comparison; if there is no file\r
+        that matches other criteria, nothing is selected.\r
+</p>\r
+</dd>\r
+<dt>\r
+--find-copies-harder\r
+</dt>\r
+<dd>\r
+<p>\r
+        For performance reasons, by default, -C option finds copies only\r
+        if the original file of the copy was modified in the same\r
+        changeset.  This flag makes the command\r
+        inspect unmodified files as candidates for the source of\r
+        copy.  This is a very expensive operation for large\r
+        projects, so use it with caution.\r
+</p>\r
+</dd>\r
+<dt>\r
+-l&lt;num&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        -M and -C options require O(n^2) processing time where n\r
+        is the number of potential rename/copy targets.  This\r
+        option prevents rename/copy detection from running if\r
+        the number of rename/copy targets exceeds the specified\r
+        number.\r
+</p>\r
+</dd>\r
+<dt>\r
+-S&lt;string&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Look for differences that contain the change in &lt;string&gt;.\r
+</p>\r
+</dd>\r
+<dt>\r
+--pickaxe-all\r
+</dt>\r
+<dd>\r
+<p>\r
+        When -S finds a change, show all the changes in that\r
+        changeset, not just the files that contain the change\r
+        in &lt;string&gt;.\r
+</p>\r
+</dd>\r
+<dt>\r
+--pickaxe-regex\r
+</dt>\r
+<dd>\r
+<p>\r
+        Make the &lt;string&gt; not a plain string but an extended POSIX\r
+        regex to match.\r
+</p>\r
+</dd>\r
+<dt>\r
+-O&lt;orderfile&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Output the patch in the order specified in the\r
+        &lt;orderfile&gt;, which has one shell glob pattern per line.\r
+</p>\r
+</dd>\r
+<dt>\r
+-R\r
+</dt>\r
+<dd>\r
+<p>\r
+        Swap two inputs; that is, show differences from index or\r
+        on-disk file to tree contents.\r
+</p>\r
+</dd>\r
+<dt>\r
+--text\r
+</dt>\r
+<dd>\r
+<p>\r
+        Treat all files as text.\r
+</p>\r
+</dd>\r
+<dt>\r
+-a\r
+</dt>\r
+<dd>\r
+<p>\r
+        Shorthand for "--text".\r
+</p>\r
+</dd>\r
+<dt>\r
+--ignore-space-at-eol\r
+</dt>\r
+<dd>\r
+<p>\r
+        Ignore changes in white spaces at EOL.\r
+</p>\r
+</dd>\r
+<dt>\r
+--ignore-space-change\r
+</dt>\r
+<dd>\r
+<p>\r
+        Ignore changes in amount of white space.  This ignores white\r
+        space at line end, and consider all other sequences of one or\r
+        more white space characters to be equivalent.\r
+</p>\r
+</dd>\r
+<dt>\r
+-b\r
+</dt>\r
+<dd>\r
+<p>\r
+        Shorthand for "--ignore-space-change".\r
+</p>\r
+</dd>\r
+<dt>\r
+--ignore-all-space\r
+</dt>\r
+<dd>\r
+<p>\r
+        Ignore white space when comparing lines.  This ignores\r
+        difference even if one line has white space where the other\r
+        line has none.\r
+</p>\r
+</dd>\r
+<dt>\r
+-w\r
+</dt>\r
+<dd>\r
+<p>\r
+        Shorthand for "--ignore-all-space".\r
+</p>\r
+</dd>\r
+</dl>\r
+<p>For more detailed explanation on these common options, see also\r
+<a href="diffcore.html">diffcore documentation</a>.</p>\r
+<dl>\r
+<dt>\r
 -o|--output-directory &lt;dir&gt;\r
 </dt>\r
 <dd>\r
@@ -491,7 +846,7 @@ git-format-patch -3
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jan-2007 00:37:19 UTC\r
+Last updated 06-Mar-2007 09:58:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-format-patch.txt b/git-format-patch.txt
index 59f34b9f0d2f4fe74fa5d90bb53393c88d36476b..84eabebe0bc767112805d2d35c68ad000d8e1003 100644 (file)
--- a/git-format-patch.txt
+++ b/git-format-patch.txt
@@ -9,8 +9,8 @@ git-format-patch - Prepare patches for e-mail submission
 SYNOPSIS
 --------
 [verse]
-'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--attach] [--thread]
-                  [-s | --signoff] [--diff-options] [--start-number <n>]
+'git-format-patch' [<common diff options>] [-n | -k] [-o <dir> | --stdout]
+                  [--attach] [--thread] [-s | --signoff] [--start-number <n>]
                   [--in-reply-to=Message-Id] [--suffix=.<sfx>]
                   [--ignore-if-in-upstream]
                   <since>[..<until>]
@@ -46,6 +46,8 @@ reference.
 
 OPTIONS
 -------
+include::diff-options.txt[]
+
 -o|--output-directory <dir>::
        Use <dir> to store the resulting files, instead of the
        current working directory.

diff --git a/git.html b/git.html
index 36ee03f0e6cdabe3377d8d2cb76256b57cb787e3..723423042752ae576c1f9f92da26b4eedd62a84a 100644 (file)
--- a/git.html
+++ b/git.html
@@ -1506,6 +1506,17 @@ their operation accordingly.</p>
 </p>\r
 </dd>\r
 <dt>\r
+&lt;commit-ish&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Indicates a commit or tag object name.  A\r
+        command that takes a &lt;commit-ish&gt; argument ultimately wants to\r
+        operate on a &lt;commit&gt; object but automatically dereferences\r
+        &lt;tag&gt; objects that point at a &lt;commit&gt;.\r
+</p>\r
+</dd>\r
+<dt>\r
 &lt;type&gt;\r
 </dt>\r
 <dd>\r
@@ -2298,7 +2309,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 05-Mar-2007 09:19:57 UTC\r
+Last updated 06-Mar-2007 09:58:13 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index 0577ad0a8cfb9d7150fb874f15e155b56fe58ad8..e875e8318d24fa046c7cddfc3e583b4c242d9302 100644 (file)
--- a/git.txt
+++ b/git.txt
@@ -241,6 +241,12 @@ Identifier Terminology
        operate on a <tree> object but automatically dereferences
        <commit> and <tag> objects that point at a <tree>.
 
+<commit-ish>::
+       Indicates a commit or tag object name.  A
+       command that takes a <commit-ish> argument ultimately wants to
+       operate on a <commit> object but automatically dereferences
+       <tag> objects that point at a <commit>.
+
 <type>::
        Indicates that an object type is required.
        Currently one of: `blob`, `tree`, `commit`, or `tag`.