| commit | ea12a7d6960c90dc0465a944b9e4426c8a972006 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 9 Jan 2013 16:26:33 +0000 (9 08:26 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 9 Jan 2013 16:26:33 +0000 (9 08:26 -0800) | ||
| tree | 327516f255b083403e29a1ee7eeebacb531475bd | treesnapshot (tar.gz zip) |
| parent | a70472f4d65ef4c8ee89d3d5b8671ebdd22d2014 | commitdiff |
| parent | 3e4141d08c8dc1964d53c2ce13de8876d29e6436 | commitdiff |
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
"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
| builtin/merge.c | diff1 | diff2 | blobhistory |