]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8d8cb4b) | patch
cherry-pick/revert: reject --rerere-autoupdate when continuing
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Wed, 2 Aug 2017 10:44:20 +0000 (11:44 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Aug 2017 22:16:09 +0000 (15:16 -0700)
commitf826fb799ed06f2f9537466f6988bcabd1200ebd
tree5421f270d921c087eebe4f5d5b55309c13dfc941tree | snapshot
parent8d8cb4b047cef546ea80b8224c7b33707f6d6a4ccommit | 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>
builtin/revert.c diff | blob | blame | history
t/t3504-cherry-pick-rerere.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.