summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Kevin Willford <kewillf@microsoft.com>2017-08-14 15:54:25 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-16 10:19:46 -0700
commit680ee550d72150f27cdb3235462eee355a20038b (patch)
treee0147e0d7e7208cca1008efbdc85471989c7e1f0 /Documentation/git-mergetool.txt
parentGit 2.12.4 (diff)
downloadtgif-680ee550d72150f27cdb3235462eee355a20038b.tar.xz
commit: skip discarding the index if there is no pre-commit hook
If there is not a pre-commit hook, there is no reason to discard the index and reread it. This change checks to presence of a pre-commit hook and then only discards the index if there was one. Signed-off-by: Kevin Willford <kewillf@microsoft.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions