index e482c8d0765650b7c5d5f565da5d9c13d251d82d..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="
return
;;
esac
return
;;
esac
- COMPREPLY=()
+
+ __gitcomp "$(__git_refs)"
}
_git_help ()
}
_git_help ()
fi
__git_complete_strategy && return
case "$cur" in
fi
__git_complete_strategy && return
case "$cur" in
+ --whitespace=*)
+ __gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
+ return
+ ;;
--*)
--*)
- __gitcomp "--onto --merge --strategy --interactive"
+ __gitcomp "
+ --onto --merge --strategy --interactive
+ --preserve-merges --stat --no-stat
+ --committer-date-is-author-date --ignore-date
+ --ignore-whitespace --whitespace=
+ "
+
return
esac
__gitcomp "$(__git_refs)"
return
esac
__gitcomp "$(__git_refs)"
esac
}
esac
}
+_git_replace ()
+{
+ __gitcomp "$(__git_refs)"
+}
+
_git_reset ()
{
__git_has_doubledash && return
_git_reset ()
{
__git_has_doubledash && return
push) _git_push ;;
rebase) _git_rebase ;;
remote) _git_remote ;;
push) _git_push ;;
rebase) _git_rebase ;;
remote) _git_remote ;;
+ replace) _git_replace ;;
reset) _git_reset ;;
revert) _git_revert ;;
rm) _git_rm ;;
reset) _git_reset ;;
revert) _git_revert ;;
rm) _git_rm ;;