| commit | 0a3beb0e2e29ca7a3c33a10112424650706edb5f | |
| author | Benoit Pierre <benoit.pierre@gmail.com> | |
| Tue, 18 Mar 2014 10:00:54 +0000 (18 11:00 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Mar 2014 18:25:38 +0000 (18 11:25 -0700) | ||
| tree | 1147468aff216f1cdff0f2ecf3ee7aad8b297449 | treesnapshot (tar.gz zip) |
| parent | 15048f8a9ace23df67161746ca76b4f46114deee | commitdiff |
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>
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>
| builtin/merge.c | diffblobblamehistory |