[PATCH v2 4/5] Add guitool completions for diff and mergetools

[Denton Liu]

Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
 contrib/completion/git-completion.bash | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/git-completion.bash 
b/contrib/completion/git-completion.bash
index 41ee52991..c94e38a3a 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1277,7 +1277,7 @@ _git_difftool ()
                        --base --ours --theirs
                        --no-renames --diff-filter= --find-copies-harder
                        --relative --ignore-submodules
-                       --tool="
+                       --tool= --gui"
                return
                ;;
        esac
@@ -1584,7 +1584,7 @@ _git_mergetool ()
                return
                ;;
        --*)
-               __gitcomp "--tool= --prompt --no-prompt"
+               __gitcomp "--tool= --prompt --no-prompt --gui"
                return
                ;;
        esac
@@ -2207,6 +2207,7 @@ _git_config ()
                diff.submodule
                diff.suppressBlankEmpty
                diff.tool
+               diff.guitool
                diff.wordRegex
                diff.algorithm
                difftool.
@@ -2308,6 +2309,7 @@ _git_config ()
                merge.renormalize
                merge.stat
                merge.tool
+               merge.guitool
                merge.verbosity
                mergetool.
                mergetool.keepBackup
-- 
2.12.0.5.gfbc750a84