Merge branch 'jk/git-tricks'

* jk/git-tricks:
  completion: match ctags symbol names in grep patterns
  contrib: add git-jump script
  contrib: add diff highlight script
This commit is contained in:
Junio C Hamano
2011-10-30 19:13:13 -07:00
5 changed files with 355 additions and 0 deletions

View File

@ -1430,6 +1430,10 @@ _git_gitk ()
_gitk
}
__git_match_ctag() {
awk "/^${1////\\/}/ { print \$1 }" "$2"
}
_git_grep ()
{
__git_has_doubledash && return
@ -1452,6 +1456,15 @@ _git_grep ()
;;
esac
case "$cword,$prev" in
2,*|*,-*)
if test -r tags; then
__gitcomp "$(__git_match_ctag "$cur" tags)"
return
fi
;;
esac
__gitcomp "$(__git_refs)"
}