| commit | aec68c3dde55601796ceee5f97cc362d58a9bd54 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 11 Aug 2017 20:27:05 +0000 (11 13:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 11 Aug 2017 20:27:05 +0000 (11 13:27 -0700) | ||
| tree | 9066f91edda0fd11182151fcfdecc7d22197c5fa | treesnapshot (tar.gz zip) |
| parent | 18965625b9f59d7e776f8da55a29c675c4668fef | commitdiff |
| parent | ad53bf79aa4ea20a8a94af9e2df5a8311ca1e55e | commitdiff |
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
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