summaryrefslogtreecommitdiff
path: root/Documentation/git-reset.txt
diff options
context:
space:
mode:
authorLibravatar Benoit Pierre <benoit.pierre@gmail.com>2014-03-18 11:00:54 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-18 11:25:38 -0700
commit0a3beb0e2e29ca7a3c33a10112424650706edb5f (patch)
tree1147468aff216f1cdff0f2ecf3ee7aad8b297449 /Documentation/git-reset.txt
parentcommit: fix patch hunk editing with "commit -p -m" (diff)
downloadtgif-0a3beb0e2e29ca7a3c33a10112424650706edb5f.tar.xz
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>
Diffstat (limited to 'Documentation/git-reset.txt')
0 files changed, 0 insertions, 0 deletions