Also, add a few comments that clarify the meaning of these variables and
sort the list of tools alphabetically.
Signed-off-by: Sebastian Schuberth <sschube...@gmail.com>
---
contrib/completion/git-completion.bash | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 5be9dee..4a76120 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1325,17 +1325,24 @@ _git_diff ()
__git_complete_revlist_file
}
-__git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
- tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3
+# Tools that support both merging and diffing.
+__git_diffmerge_tools="araxis bc3 diffuse ecmerge emerge gvimdiff
+ kdiff3 meld opendiff p4merge tkdiff vimdiff xxdiff
"
+# Tools that support diffing.
+__git_difftools="$__git_diffmerge_tools kcompare"
+
+# Tools that support merging.
+__git_mergetools="$__git_diffmerge_tools tortoisemerge"
+
_git_difftool ()
{
__git_has_doubledash && return
case "$cur" in
--tool=*)
- __gitcomp "$__git_mergetools_common kompare" ""
"${cur##--tool=}"
+ __gitcomp "$__git_difftools" "" "${cur##--tool=}"
return
;;
--*)
@@ -1623,7 +1630,7 @@ _git_mergetool ()
{
case "$cur" in
--tool=*)
- __gitcomp "$__git_mergetools_common tortoisemerge" ""
"${cur##--tool=}"
+ __gitcomp "$__git_mergetools" "" "${cur##--tool=}"
return
;;
--*)
--
1.7.11.msysgit.2
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
