]> git.ipfire.org Git - thirdparty/git.git/commit - git-mergetool.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eab335c) | patch
mergetool: add an option for writing to a temporary directory
authorDavid Aguilar <davvid@gmail.com>
Sat, 11 Oct 2014 17:04:45 +0000 (10:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Oct 2014 19:09:51 +0000 (12:09 -0700)
commit8f0cb41da26c1e20cfbcfded030d6539464b132e
treecf52392d6e9370ac20173d9a160b65082e445d6atree | snapshot
parenteab335c46d6677ff50e9fe94352150641bc05507commit | diff
mergetool: add an option for writing to a temporary directory

Teach mergetool to write files in a temporary directory when
'mergetool.writeToTemp' is true.

This is helpful for tools such as Eclipse which cannot cope with
multiple copies of the same file in the worktree.

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