| commit | b663af57c31cb6353bd86e39b880cc9602262958 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 12 Jan 2013 00:49:01 +0000 (11 16:49 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 12 Jan 2013 00:49:01 +0000 (11 16:49 -0800) | ||
| tree | 7aad0671281be8da5ffd926466dafbfec533613a | treesnapshot (tar.gz zip) |
| parent | 02cb8da20d2b575df6b81054295a0a1383c5c0e6 | commitdiff |
| parent | 3e4141d08c8dc1964d53c2ce13de8876d29e6436 | commitdiff |
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
"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 | blobhistory |