projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 325ba14 56ac168)
Merge branch 'ew/apply'
authorJunio C Hamano <junkio@cox.net>
Tue, 25 Jul 2006 19:50:23 +0000 (12:50 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 25 Jul 2006 19:50:23 +0000 (12:50 -0700)
commita8861ea81be90594d9f23d30792d6cf8d22ad1ff
treeaaef855759df564257826f4969da06e84a93dbdbtree | snapshot
parent325ba14e400d7f0df876a2ddc8e2c85d563313bdcommit | diff
parent56ac168f6f89bebf2846c4bafed01318fe3f25cdcommit | diff
Merge branch 'ew/apply'

* ew/apply:
  Fix t4114 on cygwin
  apply: handle type-changing patch correctly.
  apply: split out removal and creation into different phases.
  apply: check D/F conflicts more carefully.
  typechange tests for git apply (currently failing)
Git—the stupid content tracker