diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-03 20:29:22 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-03 20:29:22 +0300 |
| commit | 5d2a30d7d8777319c745804f040fa405d02169ce (patch) | |
| tree | 75a490997367dd1b4ea1f8e52db9260a6b6dda2b /Documentation | |
| parent | f66a5bd9236b19288ad39387ec519a11d65b513d (diff) | |
| parent | 5404c116aa921d7e2f9408e103c80b7801735d08 (diff) | |
Merge branch 'mm/diff-renames-default'
The end-user facing Porcelain level commands like "diff" and "log"
now enables the rename detection by default.
* mm/diff-renames-default:
diff: activate diff.renames by default
log: introduce init_log_defaults()
t: add tests for diff.renames (true/false/unset)
t4001-diff-rename: wrap file creations in a test
Documentation/diff-config: fix description of diff.renames
Diffstat (limited to 'Documentation')
| -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..edba56522b 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 true. 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 |