summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* commit-tree: do not complete line in -F inputrk/commit-tree-make-F-verbatimRoss Kabus2017-09-101-1/+0
* Prepare for 2.14.2Junio C Hamano2017-08-233-2/+37
* Merge branch 'jt/t1450-fsck-corrupt-packfile' into maintJunio C Hamano2017-08-231-0/+16
|\
| * tests: ensure fsck fails on corrupt packfilesjt/t1450-fsck-corrupt-packfileJonathan Tan2017-07-281-0/+16
* | Merge branch 'jb/t8008-cleanup' into maintJunio C Hamano2017-08-231-14/+16
|\ \
| * | t8008: rely on rev-parse'd HEAD instead of sha1 valuejb/t8008-cleanupStefan Beller2017-07-261-14/+16
| |/
* | Merge branch 'jt/subprocess-handshake' into maintJunio C Hamano2017-08-2314-285/+802
|\ \
| * | sub-process: refactor handshake to common functionjt/subprocess-handshakeJonathan Tan2017-07-266-90/+138
| * | Documentation: migrate sub-process docs to headerJonathan Tan2017-07-262-61/+23
| * | Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshakeJunio C Hamano2017-07-269-161/+668
| |\ \ | | |/ | |/|
| | * convert: add "status=delayed" to filter process protocolLars Schneider2017-06-309-90/+575
| | * convert: refactor capabilities negotiationLars Schneider2017-06-301-12/+27
| | * convert: move multiple file filter error handling to separate functionLars Schneider2017-06-291-21/+26
| | * convert: put the flags field before the flag itself for consistent styleLars Schneider2017-06-291-5/+5
| | * t0021: write "OUT <size>" only on successLars Schneider2017-06-292-6/+6
| | * t0021: make debug log file name configurableLars Schneider2017-06-262-25/+27
| | * t0021: keep filter log files on comparisonLars Schneider2017-06-261-6/+6
* | | Merge branch 'dc/fmt-merge-msg-microcleanup' into maintJunio C Hamano2017-08-231-1/+2
|\ \ \
| * | | fmt-merge-msg: fix coding styledc/fmt-merge-msg-microcleanupDimitrios Christidis2017-07-251-1/+2
* | | | Merge branch 'ah/doc-wserrorhighlight' into maintJunio C Hamano2017-08-232-13/+15
|\ \ \ \
| * | | | doc: add missing values "none" and "default" for diff.wsErrorHighlightah/doc-wserrorhighlightAndreas Heiduk2017-07-252-13/+15
| |/ / /
* | | | Merge branch 'cc/ref-is-hidden-microcleanup' into maintJunio C Hamano2017-08-231-5/+4
|\ \ \ \
| * | | | refs: use skip_prefix() in ref_is_hidden()cc/ref-is-hidden-microcleanupChristian Couder2017-07-241-5/+4
| |/ / /
* | | | Merge branch 'js/run-process-parallel-api-fix' into maintJunio C Hamano2017-08-232-3/+3
|\ \ \ \
| * | | | run_processes_parallel: change confusing task_cb conventionjs/run-process-parallel-api-fixJohannes Schindelin2017-07-212-3/+3
* | | | | Merge branch 'rs/pack-objects-pbase-cleanup' into maintJunio C Hamano2017-08-231-1/+1
|\ \ \ \ \
| * | | | | pack-objects: remove unnecessary NULL checkrs/pack-objects-pbase-cleanupRené Scharfe2017-07-201-1/+1
* | | | | | Merge branch 'jt/fsck-code-cleanup' into maintJunio C Hamano2017-08-233-27/+17
|\ \ \ \ \ \
| * | | | | | fsck: cleanup unused variableJonathan Tan2017-07-261-3/+1
| * | | | | | object: remove "used" field from struct objectJonathan Tan2017-07-203-12/+15
| * | | | | | fsck: remove redundant parse_tree() invocationJonathan Tan2017-07-201-12/+1
* | | | | | | Merge branch 'rs/stat-data-unaligned-reads-fix' into maintJunio C Hamano2017-08-231-23/+27
|\ \ \ \ \ \ \
| * | | | | | | dir: support platforms that require aligned readsrs/stat-data-unaligned-reads-fixRené Scharfe2017-07-171-23/+27
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'rs/move-array' into maintJunio C Hamano2017-08-2311-30/+44
|\ \ \ \ \ \ \
| * | | | | | | ls-files: don't try to prune an empty indexrs/move-arrayRené Scharfe2017-07-171-1/+1
| * | | | | | | apply: use COPY_ARRAY and MOVE_ARRAY in update_image()René Scharfe2017-07-171-7/+4
| * | | | | | | use MOVE_ARRAYRené Scharfe2017-07-179-26/+17
| * | | | | | | add MOVE_ARRAYRené Scharfe2017-07-172-0/+25
* | | | | | | | Merge branch 'rs/bswap-ubsan-fix' into maintJunio C Hamano2017-08-231-14/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | bswap: convert get_be16, get_be32 and put_be32 to inline functionsrs/bswap-ubsan-fixRené Scharfe2017-07-171-14/+24
| * | | | | | | | bswap: convert to unsigned before shifting in get_be32René Scharfe2017-07-171-4/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dl/credential-cache-socket-in-xdg-cache' into maintJunio C Hamano2017-08-231-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | credential-cache: interpret an ECONNRESET as an EOFdl/credential-cache-socket-in-xdg-cacheRamsay Jones2017-07-271-1/+1
* | | | | | | | | Merge branch 'hb/gitweb-project-list' into maintJunio C Hamano2017-08-231-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitweb: skip unreadable subdirectorieshb/gitweb-project-listHielke Christian Braun2017-07-181-0/+2
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ks/commit-abort-on-empty-message-fix' into maintJunio C Hamano2017-08-231-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit: check for empty message before the check for untouched templateks/commit-abort-on-empty-message-fixKaartic Sivaraam2017-07-171-5/+5
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/reflog-walk' into maintJunio C Hamano2017-08-238-123/+253
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | reflog-walk: apply --since/--until to reflog datesjk/reflog-walkJeff King2017-07-094-3/+55
| * | | | | | | | | reflog-walk: stop using fake parentsJeff King2017-07-095-108/+75
View Lorry Controller Status