Jay Soffian 65969d43d1 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>

2011-02-15 13:35:35 -08:00

3.4 KiB

Executable File

Raw Blame History

View Raw