summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Mark Lodato <lodatom@gmail.com>2010-09-09 21:39:37 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-10 09:31:13 -0700
commit9904fadfea002edf2ef22e8ec9a978e45d1f540b (patch)
tree37adeb6e3374efcccd240d1bfa3237f7b308b108 /Documentation
parentxdiff-interface.c: always trim trailing space from xfuncname matches (diff)
downloadtgif-9904fadfea002edf2ef22e8ec9a978e45d1f540b.tar.xz
config.txt: fix placement of diff.noprefix
In git-config(1), diff.noprefix was placed in between diff.mnemonicprefix and the list of mnemonic prefixes, which is obviously incorrect and very confusing to readers. Now, it is located after the end of the explanation of mnemonicprefix, which makes much more sense. Signed-off-by: Mark Lodato <lodatom@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index dc4e83b103..1df0f654e6 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -804,8 +804,6 @@ 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`;;
@@ -817,6 +815,9 @@ diff.noprefix::
`git diff --no-index a b`;;
compares two non-git things (1) and (2).
+diff.noprefix::
+ If set, 'git diff' does not show any source or destination prefix.
+
diff.renameLimit::
The number of files to consider when performing the copy/rename
detection; equivalent to the 'git diff' option '-l'.