Merge branch 'cb/ls-files-cdup'

[git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 95cf73cd47961f76bc40fda08ccc79494a8da748..7afd0a333f5e67fcfcc5c5277c3a871f6825ea83 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -792,6 +792,8 @@ diff.mnemonicprefix::
        standard "a/" and "b/" depending on what is being compared.  When
        this configuration is in effect, reverse diff output also swaps
        the order of the prefixes:
+diff.noprefix::
+       If set, 'git diff' does not show any source or destination prefix.
 `git diff`;;
        compares the (i)ndex and the (w)ork tree;
 `git diff HEAD`;;