From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 Aug 2017 20:27:05 +0000 (-0700)
Subject: Merge branch 'rg/rerere-train-overwrite'
X-Git-Tag: v2.15.0-rc0~189
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aec68c3dde55601796ceee5f97cc362d58a9bd54;p=thirdparty%2Fgit.git

Merge branch 'rg/rerere-train-overwrite'

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

aec68c3dde55601796ceee5f97cc362d58a9bd54