| commit | f826fb799ed06f2f9537466f6988bcabd1200ebd | |
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | |
| Wed, 2 Aug 2017 10:44:20 +0000 (2 11:44 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 2 Aug 2017 22:16:09 +0000 (2 15:16 -0700) | ||
| tree | 5421f270d921c087eebe4f5d5b55309c13dfc941 | treesnapshot (tar.gz zip) |
| parent | 8d8cb4b047cef546ea80b8224c7b33707f6d6a4c | commitdiff |
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>
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>
| builtin/revert.c | diffblobblamehistory | |
| t/t3504-cherry-pick-rerere.sh | diffblobblamehistory |