* [PATCH 2/3] Add gui completions for difftool
@ 2017-03-03 11:57 Denton Liu
0 siblings, 0 replies; only message in thread
From: Denton Liu @ 2017-03-03 11:57 UTC (permalink / raw)
To: git; +Cc: davvid, Johannes.Schindelin
Signed-off-by: Denton Liu <liu.denton@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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-03-03 11:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-03 11:57 [PATCH 2/3] Add gui completions for difftool Denton Liu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.