diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-21 20:28:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-21 20:28:42 (GMT) |
| commit | a46af5946c3ec125e0c2fee889610485eb4a6e14 (patch) | |
| tree | 3ed40836fea576ca667c5704412122780437e2c4 /Documentation | |
| parent | e96e98b3399ae4c638466f84068fe94d4712c5a3 (diff) | |
| parent | 688684eba436c021eaddab1725093bb953cf260d (diff) | |
| download | git-a46af5946c3ec125e0c2fee889610485eb4a6e14.zip git-a46af5946c3ec125e0c2fee889610485eb4a6e14.tar.gz git-a46af5946c3ec125e0c2fee889610485eb4a6e14.tar.bz2 | |
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')
| -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 04a1e2f..be6cf35 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. |