summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-22 23:25:42 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-22 23:25:42 -0800
commitf81117b84d2c99a29acf06c6522aad54defbc760 (patch)
tree8aee73b01de4b652658de0f473ee47d2a0d942e8
parent31e7bded608416e3116f9c691a4d4314f10640b6 (diff)
parent7a3db75beee75c4e1b5fdae7504bc2ba05c58b14 (diff)
downloadgit-f81117b84d2c99a29acf06c6522aad54defbc760.tar.gz
Merge branch 'maint'
* maint: Fix sample pre-commit hook
-rw-r--r--templates/hooks--pre-commit2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
index a19279b3e4..7092bae263 100644
--- a/templates/hooks--pre-commit
+++ b/templates/hooks--pre-commit
@@ -13,7 +13,7 @@
if git-rev-parse --verify HEAD 2>/dev/null
then
- git-diff-index -p -M --cached HEAD
+ git-diff-index -p -M --cached HEAD --
else
# NEEDSWORK: we should produce a diff with an empty tree here
# if we want to do the same verification for the initial import.