summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge branch 'sk/gitweb-highlight-encoding' into HEADJunio C Hamano2016-05-181-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | gitweb: apply fallback encoding before highlightsk/gitweb-highlight-encodingShin Kojima2016-05-031-0/+3
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ls/travis-submitting-patches' into HEADJunio C Hamano2016-05-181-17/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation: add setup instructions for Travis CIls/travis-submitting-patchesLars Schneider2016-05-021-17/+63
* | | | | | | | | | | | | | Merge branch 'js/close-packs-before-gc' into HEADJunio C Hamano2016-05-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t5510: run auto-gc in the foregroundjs/close-packs-before-gcSZEDER Gábor2016-05-021-0/+1
* | | | | | | | | | | | | | | Merge branch 'ls/p4-lfs' into HEADJunio C Hamano2016-05-183-10/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-p4: fix Git LFS pointer parsingLars Schneider2016-04-282-3/+14
| * | | | | | | | | | | | | | | travis-ci: express Linux/OS X dependency versions more clearlyLars Schneider2016-04-281-7/+10
| * | | | | | | | | | | | | | | travis-ci: update Git-LFS and P4 to the latest versionLars Schneider2016-04-191-2/+2
* | | | | | | | | | | | | | | | Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEADJunio C Hamano2016-05-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t9824: fix wrong reference valuels/p4-lfs-test-fix-2.7.0Lars Schneider2016-04-291-1/+1
| * | | | | | | | | | | | | | | | t9824: fix broken &&-chain in a subshellSZEDER Gábor2016-04-241-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'nf/mergetool-prompt' into HEADJunio C Hamano2016-05-184-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-promptNikola Forró2016-04-254-5/+5
| | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jd/send-email-to-whom' into HEADJunio C Hamano2016-05-181-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | send-email: fix grammo in the prompt that asks e-mail recipientsjd/send-email-to-whomJunio C Hamano2016-04-251-2/+3
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'js/win32-mmap' into HEADJunio C Hamano2016-05-181-13/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | mmap(win32): avoid expensive fstat() calljs/win32-mmapJohannes Schindelin2016-04-221-9/+7
| * | | | | | | | | | | | | | | | | mmap(win32): avoid copy-on-write when it is unnecessaryJohannes Schindelin2016-04-221-2/+3
| * | | | | | | | | | | | | | | | | win32mmap: set errno appropriatelyJohannes Schindelin2016-04-221-2/+8
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/push-client-deadlock-fix' into HEADJunio C Hamano2016-05-187-11/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Windows: only add a no-op pthread_sigmask() when neededjk/push-client-deadlock-fixJohannes Schindelin2016-05-111-0/+2
| * | | | | | | | | | | | | | | | | Windows: add pthread_sigmask() that does nothingJohannes Sixt2016-05-022-0/+6
| * | | | | | | | | | | | | | | | | t5504: drop sigpipe=ok from push testsJeff King2016-04-201-6/+4
| * | | | | | | | | | | | | | | | | fetch-pack: isolate sigpipe in demuxer threadJeff King2016-04-201-3/+1
| * | | | | | | | | | | | | | | | | send-pack: isolate sigpipe in demuxer threadJeff King2016-04-201-0/+1
| * | | | | | | | | | | | | | | | | run-command: teach async threads to ignore SIGPIPEJeff King2016-04-202-0/+11
| * | | | | | | | | | | | | | | | | send-pack: close demux pipe before finishing async processJeff King2016-04-201-2/+4
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'sb/mv-submodule-fix' into HEADJunio C Hamano2016-05-182-9/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | mv: allow moving nested submodulessb/mv-submodule-fixStefan Beller2016-04-192-9/+28
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'da/user-useconfigonly' into HEADJunio C Hamano2016-05-181-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | ident: give "please tell me" message upon useConfigOnly errorda/user-useconfigonlyMarios Titas2016-04-011-4/+8
| * | | | | | | | | | | | | | | | | ident: check for useConfigOnly before auto-detection of name/emailMarios Titas2016-04-011-6/+6
* | | | | | | | | | | | | | | | | | Merge branch 'ld/p4-test-py3' into HEADJunio C Hamano2016-05-182-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | git-p4 tests: time_in_seconds should use $PYTHON_PATHld/p4-test-py3Luke Diamand2016-04-261-1/+1
| * | | | | | | | | | | | | | | | | git-p4 tests: work with python3 as well as python2Luke Diamand2016-04-262-5/+6
| * | | | | | | | | | | | | | | | | git-p4 tests: cd to / before running pythonLuke Diamand2016-04-261-1/+1
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Almost ready for 2.8.3Junio C Hamano2016-05-061-0/+9
* | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-path-misc-bugs' into maintJunio C Hamano2016-05-063-11/+133
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t7407: make expectation as clear as possiblesb/submodule-path-misc-bugsStefan Beller2016-03-301-2/+6
| * | | | | | | | | | | | | | | | | submodule update: test recursive path reporting from subdirectoryStefan Beller2016-03-301-0/+20
| * | | | | | | | | | | | | | | | | submodule update: align reporting path for custom command executionStefan Beller2016-03-302-5/+28
| * | | | | | | | | | | | | | | | | submodule status: correct path handling in recursive submodulesStefan Beller2016-03-302-0/+22
| * | | | | | | | | | | | | | | | | submodule update --init: correct path handling in recursive submodulesStefan Beller2016-03-302-1/+34
| * | | | | | | | | | | | | | | | | submodule foreach: correct path display in recursive submodulesStefan Beller2016-03-302-3/+23
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'ky/imap-send-openssl-1.1.0' into maintJunio C Hamano2016-05-065-28/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | configure: remove checking for HMAC_CTX_cleanupky/imap-send-openssl-1.1.0Kazuki Yamaguchi2016-04-083-13/+0
| * | | | | | | | | | | | | | | | | imap-send: avoid deprecated TLSv1_method()Kazuki Yamaguchi2016-04-081-5/+4
| * | | | | | | | | | | | | | | | | imap-send: check NULL return of SSL_CTX_new()Kazuki Yamaguchi2016-04-081-0/+4