Merge branch 'bp/status-rename-config'
commit5da4847dccdf8df26f0cfbcc278034a62dbc97e0
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 05:04:07 +0000 (30 14:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 05:04:07 +0000 (30 14:04 +0900)
tree28772809fb164c3368790a7557dc84c72fcb254e
parent50f08db5941755b69012378bfc86f6b8ee98edf4
parente8b2dc2c2a8415bfd180ecf5cc237a54e69ac2e9
Merge branch 'bp/status-rename-config'

"git status" learned to honor a new status.renames configuration to
skip rename detection, which could be useful for those who want to
do so without disabling the default rename detection done by the
"git diff" command.

* bp/status-rename-config:
  add status config and command line options for rename detection
Documentation/config.txt
builtin/commit.c
wt-status.c