Merge branch 'js/default-branch-name'

[thirdparty/git.git] / Documentation / diff-options.txt

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index bb31f0c42b3f8a7b26f6eb01e7e1ad7c0b0fa008..7987d72b0212e1247ff5ea14b553d4a322c1f5f5 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/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::