diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-03 20:54:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-03 20:54:32 (GMT) |
| commit | 8ed64dfe7377971963182e9cfcd4b8da82337438 (patch) | |
| tree | bbfdeb60226b3f415d15f567d3aac4ee06054abd /templates | |
| parent | e230c568c4b9a991e3175e5f65171a566fd8e39c (diff) | |
| parent | e5be297279e8ee8c503eb59da21ab17edc40e748 (diff) | |
| download | git-8ed64dfe7377971963182e9cfcd4b8da82337438.zip git-8ed64dfe7377971963182e9cfcd4b8da82337438.tar.gz git-8ed64dfe7377971963182e9cfcd4b8da82337438.tar.bz2 | |
Merge branch 'maint-1.8.3' into maint
* maint-1.8.3:
fix shell syntax error in template
Diffstat (limited to 'templates')
| -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 15ab6d8..1f3bceb 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 |