Merge branch 'jc/apply' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 16 May 2006 00:58:02 +0000 (17:58 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 16 May 2006 00:58:02 +0000 (17:58 -0700)
commit4cb0e688d8d42c9291ff517328e541bc176b82a9
tree7bfc6af9172a996edb39aaaf00d2a82fb2bc04af
parentbaee9207b9aa6400a9b7cb9e7278e11b054fb640
parentb7627278e200d8a80df6ee437b1a01d88f2b4883
Merge branch 'jc/apply' into next

* jc/apply:
  git-am: use apply --cached
  apply --cached: apply a patch without using working tree.
apply.c
git-am.sh