index 7c7318c43679a95d05f4192304022cef8eb246ea..e3ddecc995eb30391639983d9f6f0db7567d7b9a 100755 (executable)
_git_difftool ()
{
_git_difftool ()
{
+ __git_has_doubledash && return
+
local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in
--tool=*)
local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in
--tool=*)
return
;;
--*)
return
;;
--*)
- __gitcomp "--tool="
+ __gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
+ --base --ours --theirs
+ --no-renames --diff-filter= --find-copies-harder
+ --relative --ignore-submodules
+ --tool="
return
;;
esac
return
;;
esac
- COMPREPLY=()
+ __git_complete_file
}
__git_fetch_options="
}
__git_fetch_options="