diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2016-02-25 09:59:17 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-25 09:54:06 -0800 |
| commit | 62df1e68e0086d9d8dc65a76d99f72c265dcf852 (patch) | |
| tree | ea218ef4d57876f9400475ad53bcec96036ac1a1 /Documentation/diff-config.txt | |
| parent | 7c0da37d7b0e09c199788191b322bf45fd003e3c (diff) | |
| download | git-62df1e68e0086d9d8dc65a76d99f72c265dcf852.tar.gz | |
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>
Diffstat (limited to 'Documentation/diff-config.txt')
| -rw-r--r-- | Documentation/diff-config.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 6eaa45271c..cf4a9159bf 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -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 |