aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-10 09:39:08 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-10 09:39:08 -0700
commit9ab5a338fc03d5ea5c3ad4cd56e04029cd863c83 (patch)
treeb9b4fc57306b099098838c4889e49540f03bf9ae
parent99f55ebc6757ec8777627142e7f8e1dc50f68d2c (diff)
parent9904fadfea002edf2ef22e8ec9a978e45d1f540b (diff)
downloadgit-9ab5a338fc03d5ea5c3ad4cd56e04029cd863c83.tar.gz
git-9ab5a338fc03d5ea5c3ad4cd56e04029cd863c83.tar.xz
Merge branch 'maint'
* maint: config.txt: fix placement of diff.noprefix
-rw-r--r--Documentation/config.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index d294dd6dc..d82c0da2c 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'.