summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-05-14 04:34:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-14 16:38:29 (GMT)
commitd0258b93e6eb95dd1169693dbcf12f0ae6f6a2eb (patch)
tree185670d9163ec545293c561d2255b56c1c7e8d4a /Documentation
parentd595bdc17f65f6503e18669b055d05bd500788d3 (diff)
downloadgit-d0258b93e6eb95dd1169693dbcf12f0ae6f6a2eb.zip
git-d0258b93e6eb95dd1169693dbcf12f0ae6f6a2eb.tar.gz
git-d0258b93e6eb95dd1169693dbcf12f0ae6f6a2eb.tar.bz2
doc: convert AsciiDoc {?foo} to ifdef::foo[]
The former seems to just be syntactic sugar for the latter. And as it's sugar that AsciiDoctor doesn't understand, it would be nice to avoid it. Since there are only two spots, and the resulting source is not significantly harder to read, it's worth doing. Note that this does slightly affect the generated HTML (it has an extra newline), but the rendered result for both HTML and docbook should be the same (since the newline is not syntactically significant there). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-options.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 6cb083a..f77df98 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -23,7 +23,9 @@ ifndef::git-format-patch[]
-u::
--patch::
Generate patch (see section on generating patches).
- {git-diff? This is the default.}
+ifdef::git-diff[]
+ This is the default.
+endif::git-diff[]
endif::git-format-patch[]
-s::
@@ -42,7 +44,9 @@ endif::git-format-patch[]
ifndef::git-format-patch[]
--raw::
Generate the raw format.
- {git-diff-core? This is the default.}
+ifdef::git-diff-core[]
+ This is the default.
+endif::git-diff-core[]
endif::git-format-patch[]
ifndef::git-format-patch[]