summaryrefslogtreecommitdiffstats
path: root/git-diff.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-06-02 14:51:31 -0700
committerJunio C Hamano <gitster@pobox.com>2020-06-02 14:51:31 -0700
commit3ef9e6768d632ffc1a3da0561187482e2bd16263 (patch)
treeee73e836b74e9c257f5eea1ea8e9849c8b91b2cc /git-diff.html
parent23baf5643507b41ab60afd6904db41e239dc9594 (diff)
downloadgit-htmldocs-3ef9e6768d632ffc1a3da0561187482e2bd16263.tar.gz
Autogenerated HTML docs for v2.27.0-22-g20514
Diffstat (limited to 'git-diff.html')
-rw-r--r--git-diff.html5
1 files changed, 5 insertions, 0 deletions
diff --git a/git-diff.html b/git-diff.html
index 1a6f12051..dd8c2c3be 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -1895,6 +1895,9 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
<dt class="hdlist1">
--relative[=&lt;path&gt;]
</dt>
+<dt class="hdlist1">
+--no-relative
+</dt>
<dd>
<p>
When run from a subdirectory of the project, it can be
@@ -1903,6 +1906,8 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
not in a subdirectory (e.g. in a bare repository), you
can name which subdirectory to make the output relative
to by giving a &lt;path&gt; as an argument.
+ <code>--no-relative</code> can be used to countermand both <code>diff.relative</code> config
+ option and previous <code>--relative</code>.
</p>
</dd>
<dt class="hdlist1">