diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-03 10:29:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-03 10:29:22 -0700 |
| commit | 5d2a30d7d8777319c745804f040fa405d02169ce (patch) | |
| tree | 75a490997367dd1b4ea1f8e52db9260a6b6dda2b /builtin/merge.c | |
| parent | f66a5bd9236b19288ad39387ec519a11d65b513d (diff) | |
| parent | 5404c116aa921d7e2f9408e103c80b7801735d08 (diff) | |
| download | git-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 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 101ffeff4c..c8154aaf6a 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1187,6 +1187,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) else head_commit = lookup_commit_or_die(head_sha1, "HEAD"); + init_diff_ui_defaults(); git_config(git_merge_config, NULL); if (branch_mergeoptions) |