Merge branch 'maint-1.6.0' into maint
commit281907574ca420cc9a800190509adbf89bf9a2d1
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Feb 2009 08:32:29 +0000 (3 00:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Feb 2009 08:32:29 +0000 (3 00:32 -0800)
treedc338b120a9447be2e97be7b1505ea3e8f9d4f9c
parent6ac92294b30d7c8619cf15b531448f011dbdcdcc
parentbc395643b606ffe7a5c01e2772ae0644c840f368
Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
  grep: pass -I (ignore binary) down to external grep
builtin-grep.c