diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-09 08:26:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-09 08:26:33 -0800 |
| commit | ea12a7d6960c90dc0465a944b9e4426c8a972006 (patch) | |
| tree | 327516f255b083403e29a1ee7eeebacb531475bd /test-scrap-cache-tree.c | |
| parent | Merge branch 'fc/remote-bzr' (diff) | |
| parent | merge: Honor prepare-commit-msg return code (diff) | |
| download | tgif-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 'test-scrap-cache-tree.c')
0 files changed, 0 insertions, 0 deletions