Merge branch 'tr/log-full-diff-keep-true-parents' into maint

diff --git a/templates/hooks--pre-push.sample b/templates/hooks--pre-push.sample
index 15ab6d8e7ea05ca54f0b755828e166fafe9bc28c..1f3bcebfd76ae1b37e1542631a87e5a5e3e6b1eb 100755 (executable)
--- 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