Defaulting to $replay for the sake of fixing cherry-pick was not
done conditionally, which broke git-revert.

Noticed by Luben.
Signed-off-by: NJunio C Hamano <junkio@cox.net>