projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a437900 1b19fa4)
Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jun 2009 04:08:05 +0000 (21:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jun 2009 04:08:05 +0000 (21:08 -0700)
* pb/maint-1.6.2-userdiff-fix:
  upload-archive: fix infinite loop on Cygwin
  avoid exponential regex match for java and objc function names

1  2 
builtin-upload-archive.c patch | diff1 | diff2 | blob | history

diff --cc builtin-upload-archive.c
Simple merge
Git—the stupid content tracker