Merge branch 'jk/git-tricks' into next
commit7c9bf7169673ae57397f632f653e918e879cc572
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Oct 2011 04:51:32 +0000 (23 21:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Oct 2011 04:51:32 +0000 (23 21:51 -0700)
tree876923cda74241e17d77125ce3749ccf307c80e0
parent92e2d3517c9a603adf0daff0d784b6ad6b3b9563
parent29eec71f21853f2428cdae83d6b04d4ae1084b7d
Merge branch 'jk/git-tricks' into next

* jk/git-tricks:
  completion: match ctags symbol names in grep patterns
  contrib: add git-jump script
  contrib: add diff highlight script