aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-21 13:28:42 -0700
committerJunio C Hamano <gitster@pobox.com>2014-10-21 13:28:42 -0700
commita46af5946c3ec125e0c2fee889610485eb4a6e14 (patch)
tree3ed40836fea576ca667c5704412122780437e2c4 /Documentation/config.txt
parente96e98b3399ae4c638466f84068fe94d4712c5a3 (diff)
parent688684eba436c021eaddab1725093bb953cf260d (diff)
downloadgit-a46af5946c3ec125e0c2fee889610485eb4a6e14.tar.gz
git-a46af5946c3ec125e0c2fee889610485eb4a6e14.tar.xz
Merge branch 'da/mergetool-temporary-directory'
Allow a temporary directory specified to be used while running "git mergetool" backend. * da/mergetool-temporary-directory: t7610-mergetool: add test cases for mergetool.writeToTemp mergetool: add an option for writing to a temporary directory
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 04a1e2f37..be6cf35c0 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1768,6 +1768,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.