diff options
| author | David Aguilar <davvid@gmail.com> | 2014-10-11 17:04:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-16 19:09:51 (GMT) |
| commit | 8f0cb41da26c1e20cfbcfded030d6539464b132e (patch) | |
| tree | cf52392d6e9370ac20173d9a160b65082e445d6a /Documentation | |
| parent | eab335c46d6677ff50e9fe94352150641bc05507 (diff) | |
| download | git-8f0cb41da26c1e20cfbcfded030d6539464b132e.zip git-8f0cb41da26c1e20cfbcfded030d6539464b132e.tar.gz git-8f0cb41da26c1e20cfbcfded030d6539464b132e.tar.bz2 | |
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')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index c08286e..c305aff 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1755,6 +1755,12 @@ mergetool.keepTemporaries:: preserved, otherwise they will be removed after the tool has exited. Defaults to `false`. +mergetool.writeToTemp:: + Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of + conflicting files in the worktree by default. Git will attempt + to use a temporary directory for these files when set `true`. + Defaults to `false`. + mergetool.prompt:: Prompt before each invocation of the merge resolution program. |