Merge branch 'pk/rebase-in-c-5-test'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 5f556075d3cbce74c60e81b97d4923a1ff18f78d..86b8f474c8d5af0e5a948b835ba104fd963cbff5 100644 (file)
--- 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