Skip to content

Commit

Permalink
config.txt: fix placement of diff.noprefix
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Lodato authored and Junio C Hamano committed Sep 10, 2010
1 parent 1b6ecba commit 9904fad
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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`;;
Expand All @@ -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'.
Expand Down

0 comments on commit 9904fad

Please sign in to comment.