summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-18 11:16:55 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-18 11:16:55 -0700
commit2621ac50cc2c7bb236f7f4abf8bbbb7f30168ff6 (patch)
treeb062385dea4a4fbcb012b1a485cb3f008707a057 /Documentation
parent880bd9d08081752bb4e2891aa3c16c82808ecb2e (diff)
parentf89504ddb9392fa6b9407957bf26905fd1d59d0a (diff)
downloadgit-2621ac50cc2c7bb236f7f4abf8bbbb7f30168ff6.tar.gz
Merge branch 'ec/diff-noprefix-config'
* ec/diff-noprefix-config: diff: add configuration option for disabling diff prefixes.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 95cf73cd47..7afd0a333f 100644
--- 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`;;