diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-09-03 13:58:16 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-09-03 13:58:16 -0700 |
commit | 0a41de8f81d8fa39fa17943cd1ed5e0274fef187 (patch) | |
tree | 6d2be015c4d25644a0313c2a375ff4a9374906a4 /templates/hooks--pre-push.sample | |
parent | Start the post-1.8.4 cycle (diff) | |
parent | Merge git://github.com/git-l10n/git-po into maint (diff) | |
download | tgif-0a41de8f81d8fa39fa17943cd1ed5e0274fef187.tar.xz |
Merge branch 'maint'
* maint:
fix shell syntax error in template
l10n: fr.po: hotfix for commit 6b388fc
Diffstat (limited to 'templates/hooks--pre-push.sample')
-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 |