Merge branch 'maint-1.8.2' into maint-1.8.3

gitster · gitster · commit e5be297279e8 · 2013-09-03T13:54:26.000-07:00
* maint-1.8.2:
  fix shell syntax error in template
diff --git 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
