aboutsummaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-03 15:54:03 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-03 15:54:03 -0700
commit19801d6a2768b9ce056da4635a287885d08940cb (patch)
tree686a4f4de3490f1eb9bc7f69a1a8dd2dd9c490e5 /t/t7610-mergetool.sh
parent200282f1c7eca23ad34b1c5f81bf4b9de334a7d1 (diff)
parent93741e4a915fc33a00e6facff88cd27565d10f82 (diff)
downloadgit-19801d6a2768b9ce056da4635a287885d08940cb.tar.gz
git-19801d6a2768b9ce056da4635a287885d08940cb.tar.xz
Merge branch 'jc/daemon-access-hook'
Allow an external command to tell git-daemon to decline service based on the client address, repository path, etc. * jc/daemon-access-hook: daemon: --access-hook option
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions