summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | .mailmap: update to my shorter email addressEric Wong2016-05-021-0/+1
* | | | | | | | | | Merge branch 'sb/config-exit-status-list' into HEADJunio C Hamano2016-05-181-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config doc: improve exit code listingStefan Beller2016-04-261-3/+3
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rt/string-list-lookup-cleanup' into HEADJunio C Hamano2016-05-181-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | string_list: use string-list API in unsorted_string_list_lookup()Ralf Thielow2016-04-251-4/+4
* | | | | | | | | | | Merge branch 'jk/fix-attribute-macro-in-2.5' into HEADJunio C Hamano2016-05-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remote.c: spell __attribute__ correctlyJeff King2016-04-261-1/+1
* | | | | | | | | | | | Merge branch 'sg/test-lib-simplify-expr-away' into HEADJunio C Hamano2016-05-181-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | test-lib: simplify '--option=value' parsingSZEDER Gábor2016-04-221-5/+5
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'nd/remove-unused' into HEADJunio C Hamano2016-05-184-27/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | wrapper.c: delete dead function git_mkstemps()Nguyễn Thái Ngọc Duy2016-04-222-19/+0
| * | | | | | | | | | | | dir.c: remove dead function fnmatch_icase()Nguyễn Thái Ngọc Duy2016-04-222-8/+0
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'sk/gitweb-highlight-encoding' into HEADJunio C Hamano2016-05-181-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gitweb: apply fallback encoding before highlightShin 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 CILars 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 foregroundSZEDER 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 valueLars 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 consistentNikola Forró2016-04-264-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 recipientsJunio C Hamano2016-04-251-2/+3
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'js/win32-mmap' into HEADJunio C Hamano2016-05-181-13/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | mmap(win32): avoid expensive fstat() callJohannes Schindelin2016-04-231-9/+7
| * | | | | | | | | | | | | | | | mmap(win32): avoid copy-on-write when it is unnecessaryJohannes Schindelin2016-04-231-2/+3
| * | | | | | | | | | | | | | | | win32mmap: set errno appropriatelyJohannes Schindelin2016-04-231-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 neededJohannes 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 submodulesStefan 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 errorMarios Titas2016-04-021-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_PATHLuke 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
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |