diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-11 16:49:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-11 16:49:01 -0800 |
| commit | b663af57c31cb6353bd86e39b880cc9602262958 (patch) | |
| tree | 7aad0671281be8da5ffd926466dafbfec533613a /read-cache.c | |
| parent | Merge branch 'jc/submittingpatches' into maint (diff) | |
| parent | merge: Honor prepare-commit-msg return code (diff) | |
| download | tgif-b663af57c31cb6353bd86e39b880cc9602262958.tar.xz | |
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
Diffstat (limited to 'read-cache.c')
0 files changed, 0 insertions, 0 deletions