mergetool: new config guiDefault supports auto-toggling gui by DISPLAY

[thirdparty/git.git] / Documentation / config / mergetool.txt

diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt
index e779a122d8a78f10adb6381a9d00e9041b2c5b70..56a7eeeffb4336ec05c52e96df59b501a41460bf 100644 (file)
--- a/Documentation/config/mergetool.txt
+++ b/Documentation/config/mergetool.txt
@@ -85,3 +85,10 @@ mergetool.writeToTemp::
 
 mergetool.prompt::
        Prompt before each invocation of the merge resolution program.
+
+mergetool.guiDefault::
+       Set `true` to use the `merge.guitool` by default (equivalent to
+       specifying the `--gui` argument), or `auto` to select `merge.guitool`
+       or `merge.tool` depending on the presence of a `DISPLAY` environment
+       variable value. The default is `false`, where the `--gui` argument
+       must be provided explicitly for the `merge.guitool` to be used.