aboutsummaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-22 12:41:50 -0700
committerJunio C Hamano <gitster@pobox.com>2015-05-22 12:41:50 -0700
commitd1caa5895458443cc9535b6fda6ff8480383471b (patch)
treec9e449b8416bc1a10887c36b2b4b9262cca12af1 /Documentation/diff-options.txt
parentc24e0e7751c29b71376e32383f4f7ee2bc8e218d (diff)
parentd0258b93e6eb95dd1169693dbcf12f0ae6f6a2eb (diff)
downloadgit-d1caa5895458443cc9535b6fda6ff8480383471b.tar.gz
git-d1caa5895458443cc9535b6fda6ff8480383471b.tar.xz
Merge branch 'jk/asciidoc-markup-fix'
Various documentation mark-up fixes to make the output more consistent in general and also make AsciiDoctor (an alternative formatter) happier. * jk/asciidoc-markup-fix: doc: convert AsciiDoc {?foo} to ifdef::foo[] doc: put example URLs and emails inside literal backticks doc: drop backslash quoting of some curly braces doc: convert \--option to --option doc/add: reformat `--edit` option doc: fix length of underlined section-title doc: fix hanging "+"-continuation doc: fix unquoted use of "{type}" doc: fix misrendering due to `single quote'
Diffstat (limited to 'Documentation/diff-options.txt')
-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 ccd499867..b7c3afeb3 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[]