Merge branch 'maint-1.8.3' into maint

gitster · gitster · commit 8ed64dfe7377 · 2013-09-03T13:54:32.000-07:00
* maint-1.8.3:
  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
