summaryrefslogtreecommitdiffstats
path: root/diff-options.txt
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 /diff-options.txt
parent23baf5643507b41ab60afd6904db41e239dc9594 (diff)
downloadgit-htmldocs-3ef9e6768d632ffc1a3da0561187482e2bd16263.tar.gz
Autogenerated HTML docs for v2.27.0-22-g20514
Diffstat (limited to 'diff-options.txt')
-rw-r--r--diff-options.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/diff-options.txt b/diff-options.txt
index bb31f0c42..7987d72b0 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -643,15 +643,18 @@ ifndef::git-format-patch[]
-R::
Swap two inputs; that is, show differences from index or
on-disk file to tree contents.
+endif::git-format-patch[]
--relative[=<path>]::
+--no-relative::
When run from a subdirectory of the project, it can be
told to exclude changes outside the directory and show
pathnames relative to it with this option. When you are
not in a subdirectory (e.g. in a bare repository), you
can name which subdirectory to make the output relative
to by giving a <path> as an argument.
-endif::git-format-patch[]
+ `--no-relative` can be used to countermand both `diff.relative` config
+ option and previous `--relative`.
-a::
--text::