author | Junio C Hamano <gitster@pobox.com> | |
Sat, 13 Jun 2009 19:50:42 +0000 (12:50 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 13 Jun 2009 19:50:42 +0000 (12:50 -0700) | ||
commit | 95ad2a65fbb9b7f26669fed9906fe9a1a531810b | |
tree | 596412d5d138652245b1f84d7249a471cc125108 | tree | snapshot |
parent | 0a17b2cd7ebc0beeab6121d96ce812f22994cc39 | commit | diff |
parent | 021fcd99bdafa43aa2834623d9257a1dea4492c2 | commit | diff |
Merge branch 'sp/msysgit'
* sp/msysgit:
compat/ has subdirectories: do not omit them in 'make clean'
Fix typo in nedmalloc warning fix
MinGW: Teach Makefile to detect msysgit and apply specific settings
Fix warnings in nedmalloc when compiling with GCC 4.4.0
Add custom memory allocator to MinGW and MacOS builds
MinGW readdir reimplementation to support d_type
connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
git: browsing paths with spaces when using the start command
MinGW: fix warning about implicit declaration of _getch()
test-chmtime: work around Windows limitation
Work around a regression in Windows 7, causing erase_in_line() to crash sometimes
Quiet make: do not leave Windows behind
MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore
Conflicts:
Makefile
* sp/msysgit:
compat/ has subdirectories: do not omit them in 'make clean'
Fix typo in nedmalloc warning fix
MinGW: Teach Makefile to detect msysgit and apply specific settings
Fix warnings in nedmalloc when compiling with GCC 4.4.0
Add custom memory allocator to MinGW and MacOS builds
MinGW readdir reimplementation to support d_type
connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
git: browsing paths with spaces when using the start command
MinGW: fix warning about implicit declaration of _getch()
test-chmtime: work around Windows limitation
Work around a regression in Windows 7, causing erase_in_line() to crash sometimes
Quiet make: do not leave Windows behind
MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore
Conflicts:
Makefile
Makefile | diff1 | | diff2 | | blob | history |
connect.c | diff1 | | diff2 | | blob | history |