diff options
| author | Charles Bailey <charles@hashpling.org> | 2009-01-21 22:57:48 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-27 01:13:19 -0800 |
| commit | 0ec7b6c26dad51f690cd985d4a5357634123c4b7 (patch) | |
| tree | b7a81348292f44b0b4e98e849b283d98f2f67b16 /commit.c | |
| parent | git-am: implement --reject option passed to git-apply (diff) | |
| download | git-0ec7b6c26dad51f690cd985d4a5357634123c4b7.tar.gz git-0ec7b6c26dad51f690cd985d4a5357634123c4b7.zip | |
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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions