From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 May 2018 05:04:07 +0000 (+0900)
Subject: Merge branch 'bp/status-rename-config'
X-Git-Tag: v2.18.0-rc0~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5da4847dccdf8df26f0cfbcc278034a62dbc97e0;p=thirdparty%2Fgit.git

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
---

5da4847dccdf8df26f0cfbcc278034a62dbc97e0