]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09236d8 1b19fa4)
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)
* 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
Unnamed repository; edit this file 'description' to name the repository.