![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 17 Oct 2009 06:47:58 +0000 (23:47 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 17 Oct 2009 06:47:58 +0000 (23:47 -0700) | ||
| commit | 050dfc4535578c2c49832ffeb3f05dbd4c6adff2 | |
| tree | 216b983a3c019f5a8a3721550afcb271d2185dbb | tree | snapshot |
| parent | b3118bdc91876cbc04b7e81dcf7bea71d86ce4f8 | commit | diff |
| parent | cfe370c6476392095bc3f18013d195b1cccd6184 | commit | diff |
Merge branch 'maint-1.6.4' into maint
* maint-1.6.4:
grep: do not segfault when -f is used
* maint-1.6.4:
grep: do not segfault when -f is used
| builtin-grep.c | diff1 | | diff2 | | blob | history |
| t/t7002-grep.sh | diff1 | | diff2 | | blob | history |