projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a08ca90 7a07841)
Merge branch 'dz/apply-again'
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Jul 2008 23:22:10 +0000 (16:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Jul 2008 23:22:10 +0000 (16:22 -0700)
* dz/apply-again:
  git-apply: handle a patch that touches the same path more than once better


Trivial merge
Git—the stupid content tracker