Merge branch 'rs/plug-leak-in-pack-bitmaps' into maint

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index ccd499867b64d0609df66196f833fff173dd60da..b7c3afeb3a0ce871d426de6912a6a875f37620fa 100644 (file)
--- 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[]