Merge branch 'fk/use-kwset-pickaxe-grep-f'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 17:00:38 +0000 (10:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 17:00:38 +0000 (10:00 -0700)
commit8a8895baaf9d200c907555fd30b0b6190b708a5a
tree9ca717cf5314effc5dc09528bd4ff9c1c0bfe3bf
parent96b7c4deb8152cbc6a90c6d26ad6869b45a51e9b
parentd190a0875ff0f33d60a4d7265f2098b35d162f68
Merge branch 'fk/use-kwset-pickaxe-grep-f'

* fk/use-kwset-pickaxe-grep-f:
  obstack: Fix portability issues
  Use kwset in grep
  Use kwset in pickaxe
  Adapt the kwset code to Git
  Add string search routines from GNU grep
  Add obstack.[ch] from EGLIBC 2.10
Makefile
grep.c