aboutsummaryrefslogtreecommitdiff
path: root/Documentation/diff-options.adoc
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/diff-options.adoc')
-rw-r--r--Documentation/diff-options.adoc8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/diff-options.adoc b/Documentation/diff-options.adoc
index 9cdad6f72a..fcfcdf0286 100644
--- a/Documentation/diff-options.adoc
+++ b/Documentation/diff-options.adoc
@@ -859,10 +859,18 @@ endif::git-format-patch[]
Do not show any source or destination prefix.
`--default-prefix`::
+ifdef::git-format-patch[]
+ Use the default source and destination prefixes ("a/" and "b/").
+ This overrides configuration variables such as `format.noprefix`,
+ `diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
+ (see linkgit:git-config[1]).
+endif::git-format-patch[]
+ifndef::git-format-patch[]
Use the default source and destination prefixes ("a/" and "b/").
This overrides configuration variables such as `diff.noprefix`,
`diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
(see linkgit:git-config[1]).
+endif::git-format-patch[]
`--line-prefix=<prefix>`::
Prepend an additional _<prefix>_ to every line of output.