Merge branch 'bp/status-rename-config'
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 05:04:07 +0000 (14:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 05:04:07 +0000 (14:04 +0900)
"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

1  2 
Documentation/config.txt
builtin/commit.c
wt-status.c
Simple merge
Simple merge
diff --cc wt-status.c
Simple merge