tree 1147468aff216f1cdff0f2ecf3ee7aad8b297449
parent 15048f8a9ace23df67161746ca76b4f46114deee
author Benoit Pierre <benoit.pierre@gmail.com> 1395136854 +0100
committer Junio C Hamano <gitster@pobox.com> 1395167138 -0700

merge: fix GIT_EDITOR override for commit hook

Don't set GIT_EDITOR to ":" when calling prepare-commit-msg hook if the
editor is going to be called (e.g. with "merge -e").

Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>