Merge branch 'mm/diff-renames-default'
commit5d2a30d7d8777319c745804f040fa405d02169ce
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2016 17:29:22 +0000 (3 10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2016 17:29:22 +0000 (3 10:29 -0700)
tree75a490997367dd1b4ea1f8e52db9260a6b6dda2b
parentf66a5bd9236b19288ad39387ec519a11d65b513d
parent5404c116aa921d7e2f9408e103c80b7801735d08
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
builtin/merge.c
diff.c
diff.h