Merge branch 'lt/grep'
commit9463ed0d737d498be5cbb6672428a8a1fbaf9120
authorJunio C Hamano <junkio@cox.net>
Fri, 19 May 2006 23:26:45 +0000 (19 16:26 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 19 May 2006 23:26:45 +0000 (19 16:26 -0700)
treed92339e7ee490952742122d227a6bd8839d0e835
parent3532998f407c5b4563ef15ffc52fe54e1f194993
parentbbb66c60613fe89c58d7c97a92e067add7056f4d
Merge branch 'lt/grep'

* lt/grep:
  builtin-grep: workaround for non GNU grep.
  git-am: use apply --cached
  apply --cached: apply a patch without using working tree.
  apply --numstat: show new name, not old name.