diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-28 14:37:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-28 14:37:43 -0700 |
| commit | c416a71a462b776d9f3924af7dbfda8bd4f87bdf (patch) | |
| tree | 382b0ef1b5f3124d04d7989e4f2e5703ca5f2d5f /git-diff.html | |
| parent | 8842ccc9dc941b70fd8eccbfcd41acac8627f67f (diff) | |
| download | git-htmldocs-c416a71a462b776d9f3924af7dbfda8bd4f87bdf.tar.gz | |
Autogenerated HTML docs for v2.44.0-413-gd6fd0
Diffstat (limited to 'git-diff.html')
| -rw-r--r-- | git-diff.html | 23 |
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>
|