summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-21 13:28:47 -0700
committerJunio C Hamano <gitster@pobox.com>2014-10-21 13:28:48 -0700
commit48f662dd74ed9e909a8ba878152f88a238a97b4f (patch)
treee938529a6ffce93a8d24273b98ff517d2788456f /Documentation
parenta46af5946c3ec125e0c2fee889610485eb4a6e14 (diff)
parentb12d04503b0aba1f2d68b164b348cbf94bbe570b (diff)
downloadgit-48f662dd74ed9e909a8ba878152f88a238a97b4f.tar.gz
Merge branch 'da/mergetool-meld'
Newer versions of 'meld' breaks the auto-detection we use to see if they are new enough to support the `--output` option. * da/mergetool-meld: mergetools/meld: make usage of `--output` configurable and more robust
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index be6cf35c02..400dcad21d 100644
--- a/Documentation/config.txt
+++ b/Documentation/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