Skip to content

Commit 62df1e6

Browse files
moygitster
authored andcommitted
Documentation/diff-config: fix description of diff.renames
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>
1 parent 7c0da37 commit 62df1e6

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

Documentation/diff-config.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,13 @@ diff.renameLimit::
108108
detection; equivalent to the 'git diff' option '-l'.
109109

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

115119
diff.suppressBlankEmpty::
116120
A boolean to inhibit the standard behavior of printing a space

0 commit comments

Comments
 (0)