Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | Merge branch 'sk/gitweb-highlight-encoding' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | gitweb: apply fallback encoding before highlightsk/gitweb-highlight-encoding | Shin Kojima | 2016-05-03 | 1 | -0/+3 | |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'ls/travis-submitting-patches' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -17/+63 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Documentation: add setup instructions for Travis CIls/travis-submitting-patches | Lars Schneider | 2016-05-02 | 1 | -17/+63 | |
* | | | | | | | | | | | | | | Merge branch 'js/close-packs-before-gc' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | t5510: run auto-gc in the foregroundjs/close-packs-before-gc | SZEDER Gábor | 2016-05-02 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | Merge branch 'ls/p4-lfs' into HEAD | Junio C Hamano | 2016-05-18 | 3 | -10/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | git-p4: fix Git LFS pointer parsing | Lars Schneider | 2016-04-28 | 2 | -3/+14 | |
| * | | | | | | | | | | | | | | | travis-ci: express Linux/OS X dependency versions more clearly | Lars Schneider | 2016-04-28 | 1 | -7/+10 | |
| * | | | | | | | | | | | | | | | travis-ci: update Git-LFS and P4 to the latest version | Lars Schneider | 2016-04-19 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | t9824: fix wrong reference valuels/p4-lfs-test-fix-2.7.0 | Lars Schneider | 2016-04-29 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | t9824: fix broken &&-chain in a subshell | SZEDER Gábor | 2016-04-24 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | Merge branch 'nf/mergetool-prompt' into HEAD | Junio C Hamano | 2016-05-18 | 4 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-prompt | Nikola Forró | 2016-04-25 | 4 | -5/+5 | |
| | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'jd/send-email-to-whom' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | send-email: fix grammo in the prompt that asks e-mail recipientsjd/send-email-to-whom | Junio C Hamano | 2016-04-25 | 1 | -2/+3 | |
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'js/win32-mmap' into HEAD | Junio C Hamano | 2016-05-18 | 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 'jk/push-client-deadlock-fix' into HEAD | Junio C Hamano | 2016-05-18 | 7 | -11/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | | | | | t5504: drop sigpipe=ok from push tests | Jeff King | 2016-04-20 | 1 | -6/+4 | |
| * | | | | | | | | | | | | | | | | | fetch-pack: isolate sigpipe in demuxer thread | Jeff King | 2016-04-20 | 1 | -3/+1 | |
| * | | | | | | | | | | | | | | | | | send-pack: isolate sigpipe in demuxer thread | Jeff King | 2016-04-20 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | run-command: teach async threads to ignore SIGPIPE | Jeff King | 2016-04-20 | 2 | -0/+11 | |
| * | | | | | | | | | | | | | | | | | send-pack: close demux pipe before finishing async process | Jeff King | 2016-04-20 | 1 | -2/+4 | |
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'sb/mv-submodule-fix' into HEAD | Junio C Hamano | 2016-05-18 | 2 | -9/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | mv: allow moving nested submodulessb/mv-submodule-fix | Stefan Beller | 2016-04-19 | 2 | -9/+28 | |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'da/user-useconfigonly' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -6/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | ident: give "please tell me" message upon useConfigOnly errorda/user-useconfigonly | Marios Titas | 2016-04-01 | 1 | -4/+8 | |
| * | | | | | | | | | | | | | | | | | ident: check for useConfigOnly before auto-detection of name/email | Marios Titas | 2016-04-01 | 1 | -6/+6 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'ld/p4-test-py3' into HEAD | Junio C Hamano | 2016-05-18 | 2 | -6/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | git-p4 tests: time_in_seconds should use $PYTHON_PATHld/p4-test-py3 | Luke Diamand | 2016-04-26 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | git-p4 tests: work with python3 as well as python2 | Luke Diamand | 2016-04-26 | 2 | -5/+6 | |
| * | | | | | | | | | | | | | | | | | git-p4 tests: cd to / before running python | Luke Diamand | 2016-04-26 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Almost ready for 2.8.3 | Junio C Hamano | 2016-05-06 | 1 | -0/+9 | |
* | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-path-misc-bugs' into maint | Junio C Hamano | 2016-05-06 | 3 | -11/+133 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | t7407: make expectation as clear as possiblesb/submodule-path-misc-bugs | Stefan Beller | 2016-03-30 | 1 | -2/+6 | |
| * | | | | | | | | | | | | | | | | | submodule update: test recursive path reporting from subdirectory | Stefan Beller | 2016-03-30 | 1 | -0/+20 | |
| * | | | | | | | | | | | | | | | | | submodule update: align reporting path for custom command execution | Stefan Beller | 2016-03-30 | 2 | -5/+28 | |
| * | | | | | | | | | | | | | | | | | submodule status: correct path handling in recursive submodules | Stefan Beller | 2016-03-30 | 2 | -0/+22 | |
| * | | | | | | | | | | | | | | | | | submodule update --init: correct path handling in recursive submodules | Stefan Beller | 2016-03-30 | 2 | -1/+34 | |
| * | | | | | | | | | | | | | | | | | submodule foreach: correct path display in recursive submodules | Stefan Beller | 2016-03-30 | 2 | -3/+23 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'ky/imap-send-openssl-1.1.0' into maint | Junio C Hamano | 2016-05-06 | 5 | -28/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | configure: remove checking for HMAC_CTX_cleanupky/imap-send-openssl-1.1.0 | Kazuki Yamaguchi | 2016-04-08 | 3 | -13/+0 | |
| * | | | | | | | | | | | | | | | | | imap-send: avoid deprecated TLSv1_method() | Kazuki Yamaguchi | 2016-04-08 | 1 | -5/+4 | |
| * | | | | | | | | | | | | | | | | | imap-send: check NULL return of SSL_CTX_new() | Kazuki Yamaguchi | 2016-04-08 | 1 | -0/+4 |