summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-03 10:29:22 -0700
committerJunio C Hamano <gitster@pobox.com>2016-04-03 10:29:22 -0700
commit5d2a30d7d8777319c745804f040fa405d02169ce (patch)
tree75a490997367dd1b4ea1f8e52db9260a6b6dda2b /diff.c
parentf66a5bd9236b19288ad39387ec519a11d65b513d (diff)
parent5404c116aa921d7e2f9408e103c80b7801735d08 (diff)
downloadgit-5d2a30d7d8777319c745804f040fa405d02169ce.tar.gz
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 'diff.c')
-rw-r--r--diff.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index 059123c5dc..4dfe6609d0 100644
--- a/diff.c
+++ b/diff.c
@@ -168,6 +168,11 @@ long parse_algorithm_value(const char *value)
* never be affected by the setting of diff.renames
* the user happens to have in the configuration file.
*/
+void init_diff_ui_defaults(void)
+{
+ diff_detect_rename_default = 1;
+}
+
int git_diff_ui_config(const char *var, const char *value, void *cb)
{
if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {