Merge branch 'ab/hooks'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Aug 2016 22:34:16 +0000 (15:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Aug 2016 22:34:16 +0000 (15:34 -0700)
"git rev-parse --git-path hooks/<hook>" learned to take
core.hooksPath configuration variable (introduced during 2.9 cycle)
into account.

* ab/hooks:
rev-parse: respect core.hooksPath in --git-path

1  2 
path.c
run-command.c
diff --cc path.c
Simple merge
diff --cc run-command.c
Simple merge