Mark Lodato <lodatom@xxxxxxxxx> writes: > 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@xxxxxxxxx> > --- > Documentation/config.txt | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/Documentation/config.txt b/Documentation/config.txt > index d294dd6..d82c0da 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'. Good eyes, thanks. How did that happen I wonder... -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html