diff options
| author |  David Aguilar <davvid@gmail.com> | 2014-10-11 10:04:45 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-10-16 12:09:51 -0700 |
| commit | 8f0cb41da26c1e20cfbcfded030d6539464b132e (patch) | |
| tree | cf52392d6e9370ac20173d9a160b65082e445d6a /Documentation/git-fast-import.txt | |
| parent | mergetool: use more conservative temporary filenames (diff) | |
| download | tgif-8f0cb41da26c1e20cfbcfded030d6539464b132e.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-fast-import.txt')
0 files changed, 0 insertions, 0 deletions