Merge branch 'jk/HEAD-symref-in-xfer-namespaces' into maint

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 3622d66488c7de057d32e02cd4cfd21704500822..6b14702e78498ee45f67e0084bea429d484b28cf 100644 (file)
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -79,6 +79,19 @@ success of the resolution after the custom tool has exited.
        Prompt before each invocation of the merge resolution program
        to give the user a chance to skip the path.
 
+-g::
+--gui::
+       When 'git-mergetool' is invoked with the `-g` or `--gui` option
+       the default merge tool will be read from the configured
+       `merge.guitool` variable instead of `merge.tool`. If
+       `merge.guitool` is not set, we will fallback to the tool
+       configured under `merge.tool`.
+
+--no-gui::
+       This overrides a previous `-g` or `--gui` setting and reads the
+       default merge tool will be read from the configured `merge.tool`
+       variable.
+
 -O<orderfile>::
        Process files in the order specified in the
        <orderfile>, which has one shell glob pattern per line.