]> git.ipfire.org Git - thirdparty/git.git/commit - git-mergetool.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b80da42) | patch
mergetool: respect autocrlf by using checkout-index
authorCharles Bailey <charles@hashpling.org>
Wed, 21 Jan 2009 22:57:48 +0000 (22:57 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Jan 2009 09:13:19 +0000 (01:13 -0800)
commit0ec7b6c26dad51f690cd985d4a5357634123c4b7
treeb7a81348292f44b0b4e98e849b283d98f2f67b16tree | snapshot
parentb80da424a13107c239ed40573fae3d692d19b6cdcommit | diff
mergetool: respect autocrlf by using checkout-index

Previously, git mergetool used cat-file which does not perform git to
worktree conversion. This changes mergetool to use git checkout-index
instead which means that the temporary files used for mergetool use the
correct line endings for the platform.

Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mergetool.sh diff | blob | blame | history
t/t7610-mergetool.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.