projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1896562 ad53bf7)
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)
commitaec68c3dde55601796ceee5f97cc362d58a9bd54
tree9066f91edda0fd11182151fcfdecc7d22197c5fatree | snapshot
parent18965625b9f59d7e776f8da55a29c675c4668fefcommit | diff
parentad53bf79aa4ea20a8a94af9e2df5a8311ca1e55ecommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.