]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'pb/maint-1.6.2-userdiff-fix'
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 04:46:55 +0000 (21:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 04:46:55 +0000 (21:46 -0700)
commitb58f6b50c1032a8ac56ab09e99500d43da3919d1
tree8c7ad9f6c2e5818a22752a028dead822ea5500e0
parent09236d80480c15f6da804e56a80c08d320475fb1
parent1b19fa46344f512949270dc88089574950519ea3
Merge branch 'pb/maint-1.6.2-userdiff-fix'

* pb/maint-1.6.2-userdiff-fix:
  upload-archive: fix infinite loop on Cygwin
  avoid exponential regex match for java and objc function names
builtin-upload-archive.c