index 67569901e71e5062199e48304afc424f15b57ba1..f83f019ca91a2611f5bd3474ccf6d10081320c4c 100755 (executable)
case "$cur" in
--*)
__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
- --base --ours --theirs
+ --base --ours --theirs --no-index
$__git_diff_common_options
"
return