projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5800c63) | patch
contrib/rerere-train: optionally overwrite existing resolutions
authorRaman Gupta <rocketraman@gmail.com>
Wed, 26 Jul 2017 19:08:38 +0000 (15:08 -0400)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Jul 2017 20:38:48 +0000 (13:38 -0700)
commitad53bf79aa4ea20a8a94af9e2df5a8311ca1e55e
treea0b29cb75287cb3813c9d6e87d69377dede2c0f1tree | snapshot
parent5800c63717ae35286a1441f14ffff753e01f7e2bcommit | diff
contrib/rerere-train: optionally overwrite existing resolutions

Provide the user an option to overwrite existing resolutions using an
`--overwrite` flag. This might be used, for example, if the user knows
that they already have an entry in their rerere cache for a conflict,
but wish to drop it and retrain based on the merge commit(s) passed to
the rerere-train script.

Signed-off-by: Raman Gupta <rocketraman@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/rerere-train.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.