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 | |
| 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')
| -rw-r--r-- | Documentation/diff-config.txt | 8 | ||||
| -rw-r--r-- | Documentation/git-mergetool.txt | 11 | ||||
| -rw-r--r-- | Documentation/merge-config.txt | 6 |
3 files changed, 25 insertions, 0 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 85bca83c30..e64d983c34 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -177,6 +177,14 @@ diff.tool:: Any other value is treated as a custom diff tool and requires that a corresponding difftool.<tool>.cmd variable is defined. +diff.guitool:: + Controls which diff tool is used by linkgit:git-difftool[1] when + the -g/--gui flag is specified. This variable overrides the value + configured in `merge.guitool`. The list below shows the valid + built-in values. Any other value is treated as a custom diff tool + and requires that a corresponding difftool.<guitool>.cmd variable + is defined. + include::mergetools-diff.txt[] diff.indentHeuristic:: diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 3622d66488..0c7975a050 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -79,6 +79,17 @@ 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`. + +--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. 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:: |