diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-30 16:34:40 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-30 16:34:40 +0900 |
| commit | 94d00a5c4ebb12f2552118f261d8f82c05c2501d (patch) | |
| tree | 89cfa22e35b5476dd4ae8ab79277fa6f2eb25557 /git-mergetool.txt | |
| parent | a4df8edd688285dc532353d4075d979d5ec20306 (diff) | |
| download | git-htmldocs-94d00a5c4ebb12f2552118f261d8f82c05c2501d.tar.gz | |
Autogenerated HTML docs for v2.19.1-708-g4ede3
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index 3622d6648..0c7975a05 100644 --- a/git-mergetool.txt +++ b/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. |