Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maint

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 0c7975a0507a35f9624516f0844ad11cd5141d50..6b14702e78498ee45f67e0084bea429d484b28cf 100644 (file)
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -83,7 +83,9 @@ success of the resolution after the custom tool has exited.
 --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`.
+       `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