Merge branch 'maint'
commitf81117b84d2c99a29acf06c6522aad54defbc760
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Nov 2007 07:25:42 +0000 (22 23:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Nov 2007 07:25:42 +0000 (22 23:25 -0800)
tree8aee73b01de4b652658de0f473ee47d2a0d942e8
parent31e7bded608416e3116f9c691a4d4314f10640b6
parent7a3db75beee75c4e1b5fdae7504bc2ba05c58b14
Merge branch 'maint'

* maint:
  Fix sample pre-commit hook
templates/hooks--pre-commit