summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-08 06:32:56 +0200
committerJunio C Hamano <gitster@pobox.com>2010-05-08 06:33:08 +0200
commitea0edad58f58378cb42c2895c5578524bbaba296 (patch)
tree581981e1a6a34dd098d072bf720712ba7c1f4113 /contrib
parentGit 1.7.1 (diff)
parentt5150: protect backslash with backslash in shell (diff)
downloadgit-ea0edad58f58378cb42c2895c5578524bbaba296.tar.xz
git-ea0edad58f58378cb42c2895c5578524bbaba296.zip
Merge branch 'jn/maint-request-pull' into jn/request-pull
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/git-resurrect.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/git-resurrect.sh b/contrib/git-resurrect.sh
index c364dda696..a4ed4c3c62 100755
--- a/contrib/git-resurrect.sh
+++ b/contrib/git-resurrect.sh
@@ -9,6 +9,7 @@ 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_SPEC="\
git resurrect $USAGE
--