diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-03 13:54:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-03 13:54:26 -0700 |
| commit | e5be297279e8ee8c503eb59da21ab17edc40e748 (patch) | |
| tree | 23dff8ccf588bae744b107ec994be2bd9d551628 | |
| parent | a3bc3d070cacf07dbe11b4bfec57554c8bbf1957 (diff) | |
| parent | 6897a64b652d83e477389ec1a248b47b8d821db6 (diff) | |
| download | git-e5be297279e8ee8c503eb59da21ab17edc40e748.tar.gz | |
Merge branch 'maint-1.8.2' into maint-1.8.3
* maint-1.8.2:
fix shell syntax error in template
| -rwxr-xr-x | templates/hooks--pre-push.sample | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/templates/hooks--pre-push.sample b/templates/hooks--pre-push.sample index 15ab6d8e7e..1f3bcebfd7 100755 --- a/templates/hooks--pre-push.sample +++ b/templates/hooks--pre-push.sample @@ -30,6 +30,7 @@ do if [ "$local_sha" = $z40 ] then # Handle delete + : else if [ "$remote_sha" = $z40 ] then |