From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Jun 2009 04:08:05 +0000 (-0700)
Subject: Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint
X-Git-Tag: v1.6.3.3~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=037e9d5b1575d7ede05b50c317d9d88258556d84;p=git.git

Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint

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

037e9d5b1575d7ede05b50c317d9d88258556d84