diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-11-16 10:11:30 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-11-16 10:11:30 +0000 |
| commit | ff979794a013869c418b25dba9da613e06a75e60 (patch) | |
| tree | 629bf97f0cfebf1eb936cc40b89e60d2c9c563f8 /diff-options.txt | |
| parent | 8c5802d61d9a556dee3e457a8bde52a54cc636e7 (diff) | |
| download | git-htmldocs-ff979794a013869c418b25dba9da613e06a75e60.tar.gz | |
Autogenerated HTML docs for v1.5.3.5-726-g41a7a
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 24 |
1 files changed, 23 insertions, 1 deletions
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 <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 |