summaryrefslogtreecommitdiff
path: root/quote.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-09 08:26:33 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-09 08:26:33 -0800
commitea12a7d6960c90dc0465a944b9e4426c8a972006 (patch)
tree327516f255b083403e29a1ee7eeebacb531475bd /quote.h
parentMerge branch 'fc/remote-bzr' (diff)
parentmerge: Honor prepare-commit-msg return code (diff)
downloadtgif-ea12a7d6960c90dc0465a944b9e4426c8a972006.tar.xz
Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure'
"git merge" started calling prepare-commit-msg hook like "git commit" does some time ago, but forgot to pay attention to the exit status of the hook. t7505 may want a general clean-up but that is a different topic. * ap/merge-stop-at-prepare-commit-msg-failure: merge: Honor prepare-commit-msg return code
Diffstat (limited to 'quote.h')
0 files changed, 0 insertions, 0 deletions