Andrew's git / gitweb.git / diff
?
Merge branch 'maint-1.6.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 17 Oct 2009 06:47:58 +0000 (23:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 17 Oct 2009 06:47:58 +0000 (23:47 -0700)
* maint-1.6.4:
grep: do not segfault when -f is used

1  2 
builtin-grep.c patch | diff1 | diff2 | blob | history
t/t7002-grep.sh patch | diff1 | diff2 | blob | history
diff --cc builtin-grep.c
Simple merge
diff --cc t/t7002-grep.sh
Simple merge