summaryrefslogtreecommitdiff
path: root/Documentation/diff-config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-03 17:29:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-03 17:29:22 (GMT)
commit5d2a30d7d8777319c745804f040fa405d02169ce (patch)
tree75a490997367dd1b4ea1f8e52db9260a6b6dda2b /Documentation/diff-config.txt
parentf66a5bd9236b19288ad39387ec519a11d65b513d (diff)
parent5404c116aa921d7e2f9408e103c80b7801735d08 (diff)
downloadgit-5d2a30d7d8777319c745804f040fa405d02169ce.zip
git-5d2a30d7d8777319c745804f040fa405d02169ce.tar.gz
git-5d2a30d7d8777319c745804f040fa405d02169ce.tar.bz2
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/diff-config.txt')
-rw-r--r--Documentation/diff-config.txt10
1 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 6eaa452..edba565 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