diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:48 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:49 +0900 |
| commit | 87c15d1ca969e978fb8d04bc486a28025d71e6b2 (patch) | |
| tree | b15912a355fa5d3c487dca3e25c5d5723e283b6d /Documentation/merge-config.txt | |
| parent | Merge branch 'js/mingw-load-sys-dll' (diff) | |
| parent | doc: document diff/merge.guitool config keys (diff) | |
| download | tgif-87c15d1ca969e978fb8d04bc486a28025d71e6b2.tar.xz | |
Merge branch 'dl/mergetool-gui-option'
"git mergetool" learned to take the "--[no-]gui" option, just like
"git difftool" does.
* dl/mergetool-gui-option:
doc: document diff/merge.guitool config keys
completion: support `git mergetool --[no-]gui`
mergetool: accept -g/--[no-]gui as arguments
Diffstat (limited to 'Documentation/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 662c2713ca..a7f4ea90c1 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -63,6 +63,12 @@ merge.tool:: Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<tool>.cmd variable is defined. +merge.guitool:: + Controls which merge tool is used by linkgit:git-mergetool[1] when the + -g/--gui flag is specified. The list below shows the valid built-in values. + Any other value is treated as a custom merge tool and requires that a + corresponding mergetool.<guitool>.cmd variable is defined. + include::mergetools-merge.txt[] merge.verbosity:: |