diff options
Diffstat (limited to 'contrib')
-rwxr-xr-x | contrib/git-resurrect.sh | 1 | ||||
-rwxr-xr-x | contrib/hooks/post-receive-email | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/contrib/git-resurrect.sh b/contrib/git-resurrect.sh index c364dda69..a4ed4c3c6 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 -- diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email index 58a35c828..30ae63d74 100755 --- a/contrib/hooks/post-receive-email +++ b/contrib/hooks/post-receive-email @@ -23,6 +23,13 @@ # possible for the email to be from someone other than the person doing the # push. # +# To help with debugging and use on pre-v1.5.1 git servers, this script will +# also obey the interface of hooks/update, taking its arguments on the +# command line. Unfortunately, hooks/update is called once for each ref. +# To avoid firing one email per ref, this script just prints its output to +# the screen when used in this mode. The output can then be redirected if +# wanted. +# # Config # ------ # hooks.mailinglist |