diff --git a/Documentation/config.txt b/Documentation/config.txt index d294dd6dcd29bf4bad21a51011d85c7d2cf85f19..d82c0da2cf470dbfe7936762d4645b7509647177 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -813,8 +813,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`;; @@ -826,6 +824,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'.