Skip to content

Commit 9904fad

Browse files
MarkLodatogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1b6ecba commit 9904fad

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Documentation/config.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -804,8 +804,6 @@ diff.mnemonicprefix::
804804
standard "a/" and "b/" depending on what is being compared. When
805805
this configuration is in effect, reverse diff output also swaps
806806
the order of the prefixes:
807-
diff.noprefix::
808-
If set, 'git diff' does not show any source or destination prefix.
809807
`git diff`;;
810808
compares the (i)ndex and the (w)ork tree;
811809
`git diff HEAD`;;
@@ -817,6 +815,9 @@ diff.noprefix::
817815
`git diff --no-index a b`;;
818816
compares two non-git things (1) and (2).
819817

818+
diff.noprefix::
819+
If set, 'git diff' does not show any source or destination prefix.
820+
820821
diff.renameLimit::
821822
The number of files to consider when performing the copy/rename
822823
detection; equivalent to the 'git diff' option '-l'.

0 commit comments

Comments
 (0)