From: Junio C Hamano Date: Fri, 19 May 2006 23:26:45 +0000 (-0700) Subject: Merge branch 'lt/grep' X-Git-Tag: v1.4.0-rc1~118 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9463ed0d737d498be5cbb6672428a8a1fbaf9120;p=git.git 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. --- 9463ed0d737d498be5cbb6672428a8a1fbaf9120