Merge branch 'rs/grep-function-context' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Aug 2011 22:06:49 +0000 (15:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Aug 2011 22:06:49 +0000 (15:06 -0700)
commit8d63a8c7b10eb2a813635a9d39b4258acab0aec1
tree086546dd78d81eae308d932c446c53a15aa31647
parentfe77d18a3fdef1f112d67d78d5dc6745cf2e3a8d
parent317f63c21c8eac46813eacf487485445f2f79a6d
Merge branch 'rs/grep-function-context' into next

* rs/grep-function-context:
  grep: long context options
  grep: add option to show whole function as context
Documentation/git-grep.txt