From: Junio C Hamano Date: Fri, 16 Nov 2007 10:11:30 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3.5-726-g41a7a X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff979794a013869c418b25dba9da613e06a75e60;p=git.git Autogenerated HTML docs for v1.5.3.5-726-g41a7a --- diff --git a/diff-options.txt b/diff-options.txt index b1f528ae8..e4af39351 100644 --- 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 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 7c905ea8c..b3bfaa41f 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -289,7 +289,8 @@ same as "git-diff-index" and "git-diff-tree".

- Generate patch (see section on generating patches) + Generate patch (see section on generating patches). +

@@ -323,6 +324,7 @@ same as "git-diff-index" and "git-diff-tree".

Generate the raw format. + This is the default.

@@ -381,6 +383,7 @@ same as "git-diff-index" and "git-diff-tree".

Synonym for "-p --stat". +

@@ -1114,7 +1117,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 9459e420a..a511a26d6 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -290,7 +290,8 @@ entries in the index are compared.

- Generate patch (see section on generating patches) + Generate patch (see section on generating patches). +

@@ -324,6 +325,7 @@ entries in the index are compared.

Generate the raw format. + This is the default.

@@ -382,6 +384,7 @@ entries in the index are compared.

Synonym for "-p --stat". +

@@ -1196,7 +1199,7 @@ always have the special all-zero sha1. diff --git a/git-diff-tree.html b/git-diff-tree.html index b80da2dbe..582767159 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -292,7 +292,8 @@ git-diff-tree(1) Manual Page

- Generate patch (see section on generating patches) + Generate patch (see section on generating patches). +

@@ -326,6 +327,7 @@ git-diff-tree(1) Manual Page

Generate the raw format. + This is the default.

@@ -384,6 +386,7 @@ git-diff-tree(1) Manual Page

Synonym for "-p --stat". +

@@ -1584,7 +1587,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff.html b/git-diff.html index 7820ac28c..3b7e36e65 100644 --- a/git-diff.html +++ b/git-diff.html @@ -368,7 +368,8 @@ and the range notations ("<commit>..<commit>" and

- Generate patch (see section on generating patches) + Generate patch (see section on generating patches). + This is the default.

@@ -402,6 +403,7 @@ and the range notations ("<commit>..<commit>" and

Generate the raw format. +

@@ -460,6 +462,7 @@ and the range notations ("<commit>..<commit>" and

Synonym for "-p --stat". +

@@ -1311,7 +1314,7 @@ Output diff in reverse. diff --git a/git-diff.txt b/git-diff.txt index 11c4216c4..2808a5ec4 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -75,6 +75,7 @@ and the range notations (".." and OPTIONS ------- +:git-diff: 1 include::diff-options.txt[] ...:: diff --git a/git-format-patch.html b/git-format-patch.html index 2126e9212..b09edc6cb 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -337,7 +337,7 @@ reference.

- Generate patch (see section on generating patches) + Generate patches without diffstat.

@@ -371,6 +371,7 @@ reference.

Generate the raw format. +

@@ -429,6 +430,7 @@ reference.

Synonym for "-p --stat". + This is the default.

@@ -989,7 +991,7 @@ git-format-patch -3 diff --git a/git-format-patch.txt b/git-format-patch.txt index 9d4bae2f6..6fb942985 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -66,6 +66,7 @@ reference. OPTIONS ------- +:git-format-patch: 1 include::diff-options.txt[] -:: diff --git a/git-ls-files.html b/git-ls-files.html index 8689cdee5..4aeeb3810 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -279,6 +279,7 @@ git-ls-files(1) Manual Page [-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>]* @@ -412,6 +413,15 @@ shown:

+--exclude-standard +
+
+

+ Add the standard git exclusions: .git/info/exclude, .gitignore + in each directory, and the user's global exclusion file. +

+
+
--error-unmatch
@@ -615,7 +625,7 @@ pattern file appears in.

diff --git a/git-ls-files.txt b/git-ls-files.txt index 9e454f0a4..2ec0c0d27 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt @@ -15,6 +15,7 @@ SYNOPSIS [-x |--exclude=] [-X |--exclude-from=] [--exclude-per-directory=] + [--exclude-standard] [--error-unmatch] [--with-tree=] [--full-name] [--abbrev] [--] []\* @@ -77,6 +78,10 @@ OPTIONS read additional exclude patterns that apply only to the directory and its subdirectories in . +--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 does not appear in the index, treat this as an error (return 1).