Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rg/rerere-train-overwrite'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 11 Aug 2017 20:27:05 +0000
(13:27 -0700)
committer
Junio 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
raw
|
combined
(merge:
1896562
ad53bf7
)
Trivial merge