Merge branch 'jk/git-tricks'
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Oct 2011 02:13:13 +0000 (19:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Oct 2011 02:13:13 +0000 (19:13 -0700)
commit324bc2a7ee1cffbf959652a54f4d3d59a1173104
tree7727e9a761d04222c0bb19e18b1d58053710d7d2
parente8e1c29021da446d0c50573ef9619bf74f515c20
parent29eec71f21853f2428cdae83d6b04d4ae1084b7d
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
contrib/completion/git-completion.bash