Skip to content

Commit

Permalink
Documentation/diff-config: fix description of diff.renames
Browse files Browse the repository at this point in the history
The description was misleading, since "set to any boolean value" include
"set to false", and diff.renames=false does not enable basic detection,
but actually disables it. Also, document that diff.renames only affects
Porcelain.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
moy authored and gitster committed Feb 25, 2016
1 parent 7c0da37 commit 62df1e6
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions Documentation/diff-config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,13 @@ diff.renameLimit::
detection; equivalent to the 'git diff' option '-l'.

diff.renames::
Tells Git to detect renames. If set to any boolean value, it
will enable basic rename detection. If set to "copies" or
"copy", it will detect copies, as well.
Whether and how Git detects renames. If set to "false",
rename detection is disabled. If set to "true", basic rename
detection is enabled. If set to "copies" or "copy", Git will
detect copies, as well. Defaults to false. Note that this
affects only 'git diff' Porcelain like linkgit:git-diff[1] and
linkgit:git-log[1], and not lower level commands such as
linkgit:git-diff-files[1].

diff.suppressBlankEmpty::
A boolean to inhibit the standard behavior of printing a space
Expand Down

0 comments on commit 62df1e6

Please sign in to comment.