Merge branch 'rg/rerere-train-overwrite'
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 Aug 2017 20:27:05 +0000 (13:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Aug 2017 20:27:05 +0000 (13:27 -0700)
The "rerere-train" script (in contrib/) learned the "--overwrite"
option to allow overwriting existing recorded resolutions.

* rg/rerere-train-overwrite:
contrib/rerere-train: optionally overwrite existing resolutions

Trivial merge