summaryrefslogtreecommitdiffstats
path: root/git-diff.html
diff options
context:
space:
mode:
Diffstat (limited to 'git-diff.html')
-rw-r--r--git-diff.html23
1 files changed, 20 insertions, 3 deletions
diff --git a/git-diff.html b/git-diff.html
index ead5a8cea..f10849177 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -2166,8 +2166,9 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
<dd>
<p>
Use the default source and destination prefixes ("a/" and "b/").
- This is usually the default already, but may be used to override
- config such as <code>diff.noprefix</code>.
+ This overrides configuration variables such as <code>diff.noprefix</code>,
+ <code>diff.srcPrefix</code>, <code>diff.dstPrefix</code>, and <code>diff.mnemonicPrefix</code>
+ (see <code>git-config</code>(1)).
</p>
</dd>
<dt class="hdlist1">
@@ -3224,7 +3225,7 @@ diff.mnemonicPrefix
</dl></div>
</dd>
<dt class="hdlist1">
-diff.noprefix
+diff.noPrefix
</dt>
<dd>
<p>
@@ -3232,6 +3233,22 @@ diff.noprefix
</p>
</dd>
<dt class="hdlist1">
+diff.srcPrefix
+</dt>
+<dd>
+<p>
+ If set, <em>git diff</em> uses this source prefix. Defaults to "a/".
+</p>
+</dd>
+<dt class="hdlist1">
+diff.dstPrefix
+</dt>
+<dd>
+<p>
+ If set, <em>git diff</em> uses this destination prefix. Defaults to "b/".
+</p>
+</dd>
+<dt class="hdlist1">
diff.relative
</dt>
<dd>