Merge branch 'bw/template-tool-buildconfig' into next
commit1e6fd8d6d958c91221283784f49cf3a35c9f5a5e
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Mar 2010 04:59:50 +0000 (28 21:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Mar 2010 04:59:50 +0000 (28 21:59 -0700)
tree562559cf954f33927f96ce6b00a5a1f82bb2e86e
parent8ac3436b932cfcb3069b4fd848b3ff1830c89c2b
parent100e762a60a691a4978434f1cd5532e19cad39fc
Merge branch 'bw/template-tool-buildconfig' into next

* bw/template-tool-buildconfig:
  Modernize git calling conventions in hook templates
  Make templates honour SHELL_PATH and PERL_PATH
Makefile