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 /contrib | |
| parent | 97ffca6cc74e5313a7d503f76fe2a99f13750c69 (diff) | |
| parent | c217b9384e8ecbde866bfb09e88f1d7f87bc7b29 (diff) | |
| download | git-87c15d1ca969e978fb8d04bc486a28025d71e6b2.tar.gz | |
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 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 5f556075d3..86b8f474c8 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1822,7 +1822,7 @@ _git_mergetool () return ;; --*) - __gitcomp "--tool= --prompt --no-prompt" + __gitcomp "--tool= --prompt --no-prompt --gui --no-gui" return ;; esac |