![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Feb 2012 22:57:05 +0000 (14:57 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Feb 2012 22:57:05 +0000 (14:57 -0800) | ||
| commit | 6f61eb201799ee83c3a82f1f097c18b3854c0c03 | |
| tree | cf6db24e651eb191fd373d22a2929dd90be1af41 | tree | snapshot |
| parent | 093b194cc5570c825173a90538a4c212bc64bc7f | commit | diff |
| parent | 9dd5245c1043dd18fd7b3f44b9e51eef7e4b58d8 | commit | diff |
Merge branch 'jk/grep-binary-attribute' into maint
* jk/grep-binary-attribute:
grep: pre-load userdiff drivers when threaded
grep: load file data after checking binary-ness
grep: respect diff attributes for binary-ness
grep: cache userdiff_driver in grep_source
grep: drop grep_buffer's "name" parameter
convert git-grep to use grep_source interface
grep: refactor the concept of "grep source" into an object
grep: move sha1-reading mutex into low-level code
grep: make locking flag global
* jk/grep-binary-attribute:
grep: pre-load userdiff drivers when threaded
grep: load file data after checking binary-ness
grep: respect diff attributes for binary-ness
grep: cache userdiff_driver in grep_source
grep: drop grep_buffer's "name" parameter
convert git-grep to use grep_source interface
grep: refactor the concept of "grep source" into an object
grep: move sha1-reading mutex into low-level code
grep: make locking flag global
| builtin/grep.c | diff1 | | diff2 | | blob | history |
| revision.c | diff1 | | diff2 | | blob | history |