projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 02cb8da 3e4141d)
Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 00:49:01 +0000 (16:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 00:49:01 +0000 (16:49 -0800)
commitb663af57c31cb6353bd86e39b880cc9602262958
tree7aad0671281be8da5ffd926466dafbfec533613atree | snapshot
parent02cb8da20d2b575df6b81054295a0a1383c5c0e6commit | diff
parent3e4141d08c8dc1964d53c2ce13de8876d29e6436commit | diff
Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maint

"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.

* ap/merge-stop-at-prepare-commit-msg-failure:
  merge: Honor prepare-commit-msg return code
builtin/merge.c diff1 | diff2 | blob | history
Git—the stupid content tracker