diff options
| author |  Raman Gupta <rocketraman@gmail.com> | 2017-07-26 15:08:38 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-07-26 13:38:48 -0700 |
| commit | ad53bf79aa4ea20a8a94af9e2df5a8311ca1e55e (patch) | |
| tree | a0b29cb75287cb3813c9d6e87d69377dede2c0f1 /fsck.h | |
| parent | Git 2.14-rc1 (diff) | |
| download | tgif-ad53bf79aa4ea20a8a94af9e2df5a8311ca1e55e.tar.xz | |
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>
Diffstat (limited to 'fsck.h')
0 files changed, 0 insertions, 0 deletions