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)
* jc/apply:
  apply --cached: do not check newly added file in the working tree

1  2 
apply.c

diff --cc apply.c
Simple merge