diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-21 15:14:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-21 15:14:45 -0700 |
| commit | e478e40b3bf294a7583ba51d60eedaa3083c4731 (patch) | |
| tree | ddeb2f3367cd4f38502ad03c95d6decb155523be /config.txt | |
| parent | 4c43d654605b5ec2d0624221acdda71114398253 (diff) | |
| download | git-htmldocs-e478e40b3bf294a7583ba51d60eedaa3083c4731.tar.gz | |
Autogenerated HTML docs for v2.1.2-532-g19b5d
Diffstat (limited to 'config.txt')
| -rw-r--r-- | config.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/config.txt b/config.txt index 04a1e2f37..400dcad21 100644 --- a/config.txt +++ b/config.txt @@ -1755,6 +1755,15 @@ mergetool.<tool>.trustExitCode:: if the file has been updated, otherwise the user is prompted to indicate the success of the merge. +mergetool.meld.hasOutput:: + Older versions of `meld` do not support the `--output` option. + Git will attempt to detect whether `meld` supports `--output` + by inspecting the output of `meld --help`. Configuring + `mergetool.meld.hasOutput` will make Git skip these checks and + use the configured value instead. Setting `mergetool.meld.hasOutput` + to `true` tells Git to unconditionally use the `--output` option, + and `false` avoids using `--output`. + mergetool.keepBackup:: After performing a merge, the original file with conflict markers can be saved as a file with a `.orig` extension. If this variable @@ -1768,6 +1777,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. |