Merge branch 'js/t0001-case-insensitive' into maint

diff --git a/contrib/git-resurrect.sh b/contrib/git-resurrect.sh
index 3b78ffd079ee787c59901979148b7f1da98c026b..8c171dd959f69501706c565218665ef474252d43 100755 (executable)
--- a/contrib/git-resurrect.sh
+++ b/contrib/git-resurrect.sh
@@ -9,6 +9,8 @@ other/Merge <other> into <name> (respectively) commit subjects, which
 is rather slow but allows you to resurrect other people's topic
 branches."
 
+OPTIONS_KEEPDASHDASH=
+OPTIONS_STUCKLONG=
 OPTIONS_SPEC="\
 git resurrect $USAGE
 --