Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/compat-strdup' into maint | Junio C Hamano | 2016-09-19 | 2 | -16/+11 |
|\ | |||||
| * | compat: move strdup(3) replacement to its own filers/compat-strdup | René Scharfe | 2016-09-07 | 2 | -16/+11 |
* | | Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' into maint | Junio C Hamano | 2016-09-08 | 1 | -0/+4 |
|\ \ | |||||
| * | | mingw: ensure temporary file handles are not inherited by child processesbw/mingw-avoid-inheriting-fd-to-lockfile | Ben Wijen | 2016-08-23 | 1 | -0/+4 |
| |/ | |||||
* | | Merge branch 'js/no-html-bypass-on-windows' into maint | Junio C Hamano | 2016-09-08 | 2 | -45/+0 |
|\ \ | |||||
| * | | Revert "display HTML in default browser using Windows' shell API"js/no-html-bypass-on-windows | Johannes Schindelin | 2016-08-19 | 2 | -45/+0 |
* | | | Merge branch 'jk/common-main' into maint | Junio C Hamano | 2016-09-08 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge branch 'jk/common-main-2.8' into jk/common-main | Junio C Hamano | 2016-07-06 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | mingw: declare main()'s argv as constjk/common-main-2.8 | Johannes Schindelin | 2016-07-06 | 1 | -1/+1 |
| | |/ | |||||
* | | | Merge branch 'js/nedmalloc-gcc6-warnings' into maint | Junio C Hamano | 2016-08-10 | 1 | -9/+8 |
|\ \ \ | |||||
| * | | | nedmalloc: work around overzealous GCC 6 warningjs/nedmalloc-gcc6-warnings | René Scharfe | 2016-08-05 | 1 | -5/+4 |
| * | | | nedmalloc: fix misleading indentation | Johannes Schindelin | 2016-08-04 | 1 | -4/+4 |
* | | | | Merge branch 'ew/daemon-socket-keepalive' into maint | Junio C Hamano | 2016-08-08 | 1 | -0/+3 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Windows: add missing definition of ENOTSOCKew/daemon-socket-keepalive | Johannes Sixt | 2016-07-22 | 1 | -0/+3 |
* | | | | Merge branch 'js/mingw-parameter-less-c-functions' into maint | Junio C Hamano | 2016-07-11 | 3 | -6/+6 |
|\ \ \ \ | |||||
| * | | | | mingw: let the build succeed with DEVELOPER=1js/mingw-parameter-less-c-functions | Johannes Schindelin | 2016-06-20 | 3 | -6/+6 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'rj/compat-regex-size-max-fix' into maint | Junio C Hamano | 2016-07-06 | 2 | -2/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | regex: fix a SIZE_MAX macro redefinition warningrj/compat-regex-size-max-fix | Ramsay Jones | 2016-06-06 | 2 | -2/+1 |
| |/ / | |||||
| * | | Merge branch 'kb/msys2-tty' into maint | Junio C Hamano | 2016-06-06 | 1 | -4/+54 |
| |\ \ | |||||
| * \ \ | Merge branch 'js/windows-dotgit' into maint | Junio C Hamano | 2016-05-26 | 2 | -3/+74 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'lp/typofixes' into maint | Junio C Hamano | 2016-05-26 | 1 | -1/+1 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'kb/msys2-tty' | Junio C Hamano | 2016-05-29 | 1 | -4/+54 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)kb/msys2-tty | Karsten Blees | 2016-05-26 | 1 | -4/+54 |
| |/ / / / | |||||
| * | | | | Merge branch 'js/win32-mmap' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -13/+18 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/push-client-deadlock-fix' into HEAD | Junio C Hamano | 2016-05-18 | 2 | -0/+8 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'ky/imap-send-openssl-1.1.0' into maint | Junio C Hamano | 2016-05-06 | 1 | -5/+11 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'js/mingw-tests-2.8' into maint | Junio C Hamano | 2016-04-29 | 1 | -7/+2 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'jk/push-client-deadlock-fix' | Junio C Hamano | 2016-05-18 | 2 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Windows: only add a no-op pthread_sigmask() when neededjk/push-client-deadlock-fix | Johannes Schindelin | 2016-05-11 | 1 | -0/+2 |
| * | | | | | | | | Windows: add pthread_sigmask() that does nothing | Johannes Sixt | 2016-05-02 | 2 | -0/+6 |
| * | | | | | | | | Merge branch 'jk/tighten-alloc' into maint | Junio C Hamano | 2016-03-10 | 4 | -9/+9 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Merge branch 'js/windows-dotgit' | Junio C Hamano | 2016-05-17 | 2 | -3/+74 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | mingw: remove unnecessary definitionjs/windows-dotgit | Johannes Schindelin | 2016-05-11 | 1 | -3/+0 |
| * | | | | | | | | | mingw: introduce the 'core.hideDotFiles' setting | Johannes Schindelin | 2016-05-11 | 1 | -0/+74 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'nd/error-errno' | Junio C Hamano | 2016-05-17 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | compat/win32/syslog.c: use warning_errno() | Nguyễn Thái Ngọc Duy | 2016-05-09 | 1 | -3/+3 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'lp/typofixes' | Junio C Hamano | 2016-05-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | typofix: assorted typofixes in comments, documentation and messageslp/typofixes | Li Peng | 2016-05-06 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'js/win32-mmap' | Junio C Hamano | 2016-04-29 | 1 | -13/+18 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | mmap(win32): avoid expensive fstat() calljs/win32-mmap | Johannes Schindelin | 2016-04-22 | 1 | -9/+7 |
| * | | | | | | | mmap(win32): avoid copy-on-write when it is unnecessary | Johannes Schindelin | 2016-04-22 | 1 | -2/+3 |
| * | | | | | | | win32mmap: set errno appropriately | Johannes Schindelin | 2016-04-22 | 1 | -2/+8 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'ky/imap-send-openssl-1.1.0' | Junio C Hamano | 2016-04-22 | 1 | -5/+11 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | imap-send: use HMAC() function provided by OpenSSL | Kazuki Yamaguchi | 2016-04-08 | 1 | -5/+11 |
* | | | | | | | Merge branch 'js/mingw-tests-2.8' | Junio C Hamano | 2016-04-13 | 1 | -7/+2 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Windows: shorten code by re-using convert_slashes()js/mingw-tests-2.8 | Johannes Sixt | 2016-04-04 | 1 | -7/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | MSVC: use shipped headers instead of fallback definitionsss/msvc | Sven Strickroth | 2016-03-30 | 2 | -1/+5 |
* | | | | | MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more | Sven Strickroth | 2016-03-30 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | config --show-origin: report paths with forward slashes | Johannes Schindelin | 2016-03-23 | 1 | -0/+6 |
* | | | | Merge branch 'js/pthread-exit-emu-windows' | Junio C Hamano | 2016-03-04 | 1 | -1/+1 |
|\ \ \ \ |