Merge branch 'jc/apply'
authorJunio C Hamano <junkio@cox.net>
Wed, 17 May 2006 22:47:33 +0000 (15:47 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 17 May 2006 22:47:33 +0000 (15:47 -0700)
* jc/apply:
  git-am: use apply --cached
  apply --cached: apply a patch without using working tree.
  apply --numstat: show new name, not old name.

1  2 
git-am.sh

diff --cc git-am.sh
Simple merge