diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2019-05-31 14:34:26 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2019-05-31 14:34:26 +0800 |
| commit | a17177ce3ac74afc0b2e6fc6c80c1e1991b96a13 (patch) | |
| tree | 0ff1a62d28a13bc8d8708148b85d3b0ba2632f92 /Documentation/git-mergetool.txt | |
| parent | Merge branch 'master' of https://github.com/Softcatala/git-po (diff) | |
| parent | Git 2.22-rc2 (diff) | |
| download | tgif-a17177ce3ac74afc0b2e6fc6c80c1e1991b96a13.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
* 'master' of git://git.kernel.org/pub/scm/git/git: (66 commits)
Git 2.22-rc2
...
Diffstat (limited to 'Documentation/git-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 0c7975a050..6b14702e78 100644 --- 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 |