Code

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)
* 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

1  2 
Makefile
grep.c

diff --cc Makefile
Simple merge
diff --cc grep.c
Simple merge