diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2017-08-02 13:44:20 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-03 01:16:09 +0300 |
| commit | f826fb799ed06f2f9537466f6988bcabd1200ebd (patch) | |
| tree | 5421f270d921c087eebe4f5d5b55309c13dfc941 /builtin/revert.c | |
| parent | 8d8cb4b047cef546ea80b8224c7b33707f6d6a4c (diff) | |
cherry-pick/revert: reject --rerere-autoupdate when continuing
cherry-pick and revert should not accept --[no-]rerere-autoupdate once
they have started.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/revert.c')
| -rw-r--r-- | builtin/revert.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index 16028b9ea8..b9d927eb09 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -155,6 +155,8 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts) "--strategy-option", opts->xopts ? 1 : 0, "-x", opts->record_origin, "--ff", opts->allow_ff, + "--rerere-autoupdate", opts->allow_rerere_auto == RERERE_AUTOUPDATE, + "--no-rerere-autoupdate", opts->allow_rerere_auto == RERERE_NOAUTOUPDATE, NULL); } |