From: Sebastian Schuberth Date: Mon, 23 Jul 2012 07:18:12 GMT Subject: [PATCH v2 2/5] Use variables for the lists of tools that support merging / diffing Message-ID: <500CFAB4.4050905@gmail.com> In-Reply-To: <500CF9D2.30102@gmail.com> Also, add a few comments that clarify the meaning of these variables. Signed-off-by: Sebastian Schuberth --- contrib/completion/git-completion.bash | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index f2c4894..6b9b79d 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1325,17 +1325,24 @@ _git_diff () __git_complete_revlist_file } +# Tools that support both merging and diffing. __git_mergetools_common="araxis bc3 diffuse ecmerge emerge gvimdiff kdiff3 meld opendiff p4merge tkdiff vimdiff xxdiff " +# Tools that support diffing. +__git_difftools="$__git_mergetools_common kcompare" + +# Tools that support merging. +__git_mergetools="$__git_mergetools_common 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