[PATCH 2/3] Add gui completions for difftool

[Denton Liu]

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

diff --git a/contrib/completion/git-completion.bash 
b/contrib/completion/git-completion.bash
index d5f3b9aeb..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
@@ -2207,6 +2207,7 @@ _git_config ()
                diff.submodule
                diff.suppressBlankEmpty
                diff.tool
+               diff.guitool
                diff.wordRegex
                diff.algorithm
                difftool.
-- 
2.12.0.1.g5415fdfc5.dirty