diff options
| author | Denton Liu <liu.denton@gmail.com> | 2018-10-24 19:25:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-25 08:01:16 +0300 |
| commit | 57ba181270e07ba66c55c9af466e95ab9f739680 (patch) | |
| tree | 2a5df8d3a5c9b5db4ff83a534f34168f28c1cf1c /contrib | |
| parent | 063f2bdbf767dd24bc0a35b5476d8025ee8646c7 (diff) | |
completion: support `git mergetool --[no-]gui`
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Anmol Mago <anmolmago@gmail.com>
Signed-off-by: Brian Ho <briankyho@gmail.com>
Signed-off-by: David Lu <david.lu97@outlook.com>
Signed-off-by: Ryan Wang <shirui.wang@hotmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 db7fd87b6b..a45b4a0508 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1833,7 +1833,7 @@ _git_mergetool () return ;; --*) - __gitcomp "--tool= --prompt --no-prompt" + __gitcomp "--tool= --prompt --no-prompt --gui --no-gui" return ;; esac |