Code

Merge branch 'lt/grep'
authorJunio C Hamano <junkio@cox.net>
Fri, 19 May 2006 23:26:45 +0000 (16:26 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 19 May 2006 23:26:45 +0000 (16:26 -0700)
* 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.


Trivial merge