diff options
| author |  Jay Soffian <jaysoffian@gmail.com> | 2011-02-14 20:07:50 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-02-15 13:35:35 -0800 |
| commit | 65969d43d10512a44f5e7248e4404b946d1d0d9f (patch) | |
| tree | 9b9d06d73f8fa67afb230c42959de0c33bfbf3fd /git-merge-resolve.sh | |
| parent | Git 1.7.4 (diff) | |
| download | tgif-65969d43d10512a44f5e7248e4404b946d1d0d9f.tar.xz | |
merge: honor prepare-commit-msg hook
When a merge is stopped due to conflicts or --no-commit, the
subsequent commit calls the prepare-commit-msg hook. However,
it is not called after a clean merge. Fix this inconsistency
by invoking the hook after clean merges as well.
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions