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>
Mark Lodato committed
Sep 9, 2010 at 21:39 UTC
9904fadfea002edf2ef22e8ec9a978e45d1f540b
1 file changed
+3
-2
Documentation/config.txt
+3
-2
@@ -804,8 +804,6 @@ diff.mnemonicprefix::
804
standard "a/" and "b/" depending on what is being compared. When
805
this configuration is in effect, reverse diff output also swaps
806
the order of the prefixes:
807
-diff.noprefix::
808
- If set, 'git diff' does not show any source or destination prefix.
807
`git diff`;;
808
compares the (i)ndex and the (w)ork tree;
809
`git diff HEAD`;;
@@ -817,6 +815,9 @@ diff.noprefix::
815
`git diff --no-index a b`;;
816
compares two non-git things (1) and (2).
817
818
+diff.noprefix::
819
+ If set, 'git diff' does not show any source or destination prefix.
820
+
821
diff.renameLimit::
822
The number of files to consider when performing the copy/rename
823
detection; equivalent to the 'git diff' option '-l'.