Autogenerated HTML docs for v1.5.3.5-726-g41a7a

diff --git a/diff-options.txt b/diff-options.txt
index b1f528ae8864e429a509365a79d16bb8341620e1..e4af393515c346528bccb7a4f2d3823aebddddfc 100644 (file)
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -1,5 +1,25 @@
+// Please don't remove this comment as asciidoc behaves badly when
+// the first non-empty line is ifdef/ifndef. The symptom is that
+// without this comment the <git-diff-core> attribute conditionally
+// defined below ends up being defined unconditionally.
+// Last checked with asciidoc 7.0.2.
+
+ifndef::git-format-patch[]
+ifndef::git-diff[]
+:git-diff-core: 1
+endif::git-diff[]
+endif::git-format-patch[]
+
+ifdef::git-format-patch[]
 -p::
-       Generate patch (see section on generating patches)
+       Generate patches without diffstat.
+endif::git-format-patch[]
+
+ifndef::git-format-patch[]
+-p::
+       Generate patch (see section on generating patches).
+       {git-diff? This is the default.}
+endif::git-format-patch[]
 
 -u::
        Synonym for "-p".
@@ -13,6 +33,7 @@
 
 --raw::
        Generate the raw format.
+       {git-diff-core? This is the default.}
 
 --patch-with-raw::
        Synonym for "-p --raw".
@@ -41,6 +62,7 @@
 
 --patch-with-stat::
        Synonym for "-p --stat".
+       {git-format-patch? This is the default.}
 
 -z::
        NUL-line termination on output.  This affects the --raw

diff --git a/git-diff-files.html b/git-diff-files.html
index 7c905ea8c5bd133e5a6d08299165d1fe85fa34d6..b3bfaa41f43b9f03f1f8dedac48a6bc4faee2f48 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -289,7 +289,8 @@ same as "git-diff-index" and "git-diff-tree".</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Generate patch (see section on generating patches)\r
+        Generate patch (see section on generating patches).\r
+        \r
 </p>\r
 </dd>\r
 <dt>\r
@@ -323,6 +324,7 @@ same as "git-diff-index" and "git-diff-tree".</p>
 <dd>\r
 <p>\r
         Generate the raw format.\r
+         This is the default.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -381,6 +383,7 @@ same as "git-diff-index" and "git-diff-tree".</p>
 <dd>\r
 <p>\r
         Synonym for "-p --stat".\r
+        \r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1114,7 +1117,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:27 UTC\r
+Last updated 16-Nov-2007 10:10:37 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-index.html b/git-diff-index.html
index 9459e420a384914bb7fc53a0c43c77a3e6508279..a511a26d691cabd70728d9cce22dfd83d9a4ac96 100644 (file)
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -290,7 +290,8 @@ entries in the index are compared.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Generate patch (see section on generating patches)\r
+        Generate patch (see section on generating patches).\r
+        \r
 </p>\r
 </dd>\r
 <dt>\r
@@ -324,6 +325,7 @@ entries in the index are compared.</p>
 <dd>\r
 <p>\r
         Generate the raw format.\r
+         This is the default.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -382,6 +384,7 @@ entries in the index are compared.</p>
 <dd>\r
 <p>\r
         Synonym for "-p --stat".\r
+        \r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1196,7 +1199,7 @@ always have the special all-zero sha1.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:28 UTC\r
+Last updated 16-Nov-2007 10:10:37 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index b80da2dbeef240a6fb12f7cb8292edf49a6a549f..5827671591737b1150422fa299a5beba63bc2b4e 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -292,7 +292,8 @@ git-diff-tree(1) Manual Page
 </dt>\r
 <dd>\r
 <p>\r
-        Generate patch (see section on generating patches)\r
+        Generate patch (see section on generating patches).\r
+        \r
 </p>\r
 </dd>\r
 <dt>\r
@@ -326,6 +327,7 @@ git-diff-tree(1) Manual Page
 <dd>\r
 <p>\r
         Generate the raw format.\r
+         This is the default.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -384,6 +386,7 @@ git-diff-tree(1) Manual Page
 <dd>\r
 <p>\r
         Synonym for "-p --stat".\r
+        \r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1584,7 +1587,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:28 UTC\r
+Last updated 16-Nov-2007 10:10:38 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff.html b/git-diff.html
index 7820ac28ccc6ed5e7a0fb4b63fa3e4efbf3c06d4..3b7e36e65cef80211a38e46fb07d32c216e88834 100644 (file)
--- a/git-diff.html
+++ b/git-diff.html
@@ -368,7 +368,8 @@ and the range notations ("<commit>..<commit>" and
 </dt>\r
 <dd>\r
 <p>\r
-        Generate patch (see section on generating patches)\r
+        Generate patch (see section on generating patches).\r
+         This is the default.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -402,6 +403,7 @@ and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and
 <dd>\r
 <p>\r
         Generate the raw format.\r
+        \r
 </p>\r
 </dd>\r
 <dt>\r
@@ -460,6 +462,7 @@ and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and
 <dd>\r
 <p>\r
         Synonym for "-p --stat".\r
+        \r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1311,7 +1314,7 @@ Output diff in reverse.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:29 UTC\r
+Last updated 16-Nov-2007 10:10:38 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff.txt b/git-diff.txt
index 11c4216c4a5c705c6af55b1367cae96b13c20251..2808a5ec44d8a9e911faf4c7d24eb844d69390f2 100644 (file)
--- a/git-diff.txt
+++ b/git-diff.txt
@@ -75,6 +75,7 @@ and the range notations ("<commit>..<commit>" and
 
 OPTIONS
 -------
+:git-diff: 1
 include::diff-options.txt[]
 
 <path>...::

diff --git a/git-format-patch.html b/git-format-patch.html
index 2126e9212834b9169de994ccf3ec64831dfe54e7..b09edc6cbb5641be47af5171327b4dd6e9782d02 100644 (file)
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -337,7 +337,7 @@ reference.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Generate patch (see section on generating patches)\r
+        Generate patches without diffstat.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -371,6 +371,7 @@ reference.</p>
 <dd>\r
 <p>\r
         Generate the raw format.\r
+        \r
 </p>\r
 </dd>\r
 <dt>\r
@@ -429,6 +430,7 @@ reference.</p>
 <dd>\r
 <p>\r
         Synonym for "-p --stat".\r
+         This is the default.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -989,7 +991,7 @@ git-format-patch -3
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Nov-2007 00:12:54 UTC\r
+Last updated 16-Nov-2007 10:10:39 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-format-patch.txt b/git-format-patch.txt
index 9d4bae2f600ba637a978648fe81cac5d6cbc903b..6fb94298516620e6991e82272a7e657a8296f7ca 100644 (file)
--- a/git-format-patch.txt
+++ b/git-format-patch.txt
@@ -66,6 +66,7 @@ reference.
 
 OPTIONS
 -------
+:git-format-patch: 1
 include::diff-options.txt[]
 
 -<n>::

diff --git a/git-ls-files.html b/git-ls-files.html
index 8689cdee536d95ba527792a87467243669a6a5e5..4aeeb38109c7d9063ac2beb3cab1dc0e1d31b8de 100644 (file)
--- a/git-ls-files.html
+++ b/git-ls-files.html
@@ -279,6 +279,7 @@ git-ls-files(1) Manual Page
                 [-x <pattern>|--exclude=<pattern>]\r
                 [-X <file>|--exclude-from=<file>]\r
                 [--exclude-per-directory=<file>]\r
+                [--exclude-standard]\r
                 [--error-unmatch] [--with-tree=<tree-ish>]\r
                 [--full-name] [--abbrev] [--] [&lt;file&gt;]*</div></div>\r
 </div>\r
@@ -412,6 +413,15 @@ shown:</p>
 </p>\r
 </dd>\r
 <dt>\r
+--exclude-standard\r
+</dt>\r
+<dd>\r
+<p>\r
+        Add the standard git exclusions: .git/info/exclude, .gitignore\r
+        in each directory, and the user's global exclusion file.\r
+</p>\r
+</dd>\r
+<dt>\r
 --error-unmatch\r
 </dt>\r
 <dd>\r
@@ -615,7 +625,7 @@ pattern file appears in.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:35 UTC\r
+Last updated 16-Nov-2007 10:10:40 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ls-files.txt b/git-ls-files.txt
index 9e454f0a4da465606afbed1720b7bd10cca8b241..2ec0c0d270edde03adff3f56531e4cee5fe05a57 100644 (file)
--- a/git-ls-files.txt
+++ b/git-ls-files.txt
@@ -15,6 +15,7 @@ SYNOPSIS
                [-x <pattern>|--exclude=<pattern>]
                [-X <file>|--exclude-from=<file>]
                [--exclude-per-directory=<file>]
+               [--exclude-standard]
                [--error-unmatch] [--with-tree=<tree-ish>]
                [--full-name] [--abbrev] [--] [<file>]\*
 
@@ -77,6 +78,10 @@ OPTIONS
        read additional exclude patterns that apply only to the
        directory and its subdirectories in <file>.
 
+--exclude-standard::
+       Add the standard git exclusions: .git/info/exclude, .gitignore
+       in each directory, and the user's global exclusion file.
+
 --error-unmatch::
        If any <file> does not appear in the index, treat this as an
        error (return 1).