| commit | 0ec7b6c26dad51f690cd985d4a5357634123c4b7 | |
| author | Charles Bailey <charles@hashpling.org> | |
| Wed, 21 Jan 2009 22:57:48 +0000 (21 22:57 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Jan 2009 09:13:19 +0000 (27 01:13 -0800) | ||
| tree | b7a81348292f44b0b4e98e849b283d98f2f67b16 | treesnapshot (tar.gz zip) |
| parent | b80da424a13107c239ed40573fae3d692d19b6cd | commitdiff |
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>
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 | diffblobblamehistory | |
| t/t7610-mergetool.sh | diffblobblamehistory |