]> git.tokkee.org Git - git.git/commitdiff
[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22b49b7 d91d4c2)
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 patch | diff1 | diff2 | blob | history

diff --cc apply.c
Simple merge
Git - the stupid content tracker