Skip to content

Commit 57ba181

Browse files
Denton-Lgitster
authored andcommitted
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>
1 parent 063f2bd commit 57ba181

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

contrib/completion/git-completion.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1833,7 +1833,7 @@ _git_mergetool ()
18331833
return
18341834
;;
18351835
--*)
1836-
__gitcomp "--tool= --prompt --no-prompt"
1836+
__gitcomp "--tool= --prompt --no-prompt --gui --no-gui"
18371837
return
18381838
;;
18391839
esac

0 commit comments

Comments
 (0)