Merge branch 'jc/apply' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 17 May 2006 23:56:20 +0000 (16:56 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 17 May 2006 23:56:20 +0000 (16:56 -0700)
commitb312cc82b4995414ece4c52119be38040d9626d7
treea0d9e4b7ce8a726e0eb94a28fec6d8eb0b9b6967
parent22b49b7fb960921146ebc7b49fe1f014e828b671
parentd91d4c2c500b17d50359693a406a2c68b65330fe
Merge branch 'jc/apply' into next

* jc/apply:
  apply --cached: do not check newly added file in the working tree
apply.c