git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 15048f8)
merge: fix GIT_EDITOR override for commit hook
authorBenoit Pierre <redacted>
Tue, 18 Mar 2014 10:00:54 +0000 (11:00 +0100)
committerJunio C Hamano <redacted>
Tue, 18 Mar 2014 18:25:38 +0000 (11:25 -0700)
commit0a3beb0e2e29ca7a3c33a10112424650706edb5f
tree1147468aff216f1cdff0f2ecf3ee7aad8b297449tree | snapshot
parent15048f8a9ace23df67161746ca76b4f46114deeecommit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/merge.c diff | blob | history
git clone https://git.99rst.org/PROJECT