summaryrefslogtreecommitdiff
path: root/merge-blobs.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-08-19 15:34:16 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-19 15:34:16 -0700
commitd05d0e99665ecb67c3e8b9b3be40b12e9052a8b8 (patch)
treec4ed27f64e3b43de4b0ae9c63b43ea6e201e7c9f /merge-blobs.c
parentMerge branch 'jk/difftool-command-not-found' (diff)
parentrev-parse: respect core.hooksPath in --git-path (diff)
downloadtgif-d05d0e99665ecb67c3e8b9b3be40b12e9052a8b8.tar.xz
Merge branch 'ab/hooks'
"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
Diffstat (limited to 'merge-blobs.c')
0 files changed, 0 insertions, 0 deletions