diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:20 -0700 |
| commit | 3b65270dcc1fe2d16f055d1a36a29616b9f89141 (patch) | |
| tree | 9a32df00a01280c4e3de344818a74e0bbc157d6f /contrib | |
| parent | 8e3bc1456efdd4cc875d194e4fbdad07b325354b (diff) | |
| parent | bf4d382615ac2a3d2df7eae3020dc9103889d2ae (diff) | |
| download | git-3b65270dcc1fe2d16f055d1a36a29616b9f89141.tar.gz | |
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-x | contrib/git-resurrect.sh | 1 |
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 -- |