summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-05-21 04:02:20 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-05-21 04:02:20 -0700
commit3b65270dcc1fe2d16f055d1a36a29616b9f89141 (patch)
tree9a32df00a01280c4e3de344818a74e0bbc157d6f /contrib
parentMerge branch 'jn/shortlog' (diff)
parenttests: chmod +x t5150 (diff)
downloadtgif-3b65270dcc1fe2d16f055d1a36a29616b9f89141.tar.xz
Merge branch 'jn/request-pull'
* jn/request-pull: tests: chmod +x t5150 adapt request-pull tests for new pull request format t5150: protect backslash with backslash in shell request-pull: protect against OPTIONS_KEEPDASHDASH from environment tests for 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
--