Merge branch 'jk/remote-pushremote-config-reading'

diff --git a/contrib/git-resurrect.sh b/contrib/git-resurrect.sh
index c364dda696912037cfafdb5e182b6e58f99e0a7e..d7e97bbc76c27f61e83a5328831fd6889b22e662 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
 --