Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | apply: check date of potential epoch timestamps first | René Scharfe | 2017-08-25 | 1 | -16/+17 |
* | Prepare for 2.14.2 | Junio C Hamano | 2017-08-23 | 3 | -2/+37 |
* | Merge branch 'jt/t1450-fsck-corrupt-packfile' into maint | Junio C Hamano | 2017-08-23 | 1 | -0/+16 |
|\ | |||||
| * | tests: ensure fsck fails on corrupt packfiles | Jonathan Tan | 2017-07-29 | 1 | -0/+16 |
* | | Merge branch 'jb/t8008-cleanup' into maint | Junio C Hamano | 2017-08-23 | 1 | -14/+16 |
|\ \ | |||||
| * | | t8008: rely on rev-parse'd HEAD instead of sha1 value | Stefan Beller | 2017-07-26 | 1 | -14/+16 |
| |/ | |||||
* | | Merge branch 'jt/subprocess-handshake' into maint | Junio C Hamano | 2017-08-23 | 14 | -285/+802 |
|\ \ | |||||
| * | | sub-process: refactor handshake to common function | Jonathan Tan | 2017-07-26 | 6 | -90/+138 |
| * | | Documentation: migrate sub-process docs to header | Jonathan Tan | 2017-07-26 | 2 | -61/+23 |
| * | | Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake | Junio C Hamano | 2017-07-26 | 9 | -161/+668 |
| |\ \ | | |/ | |/| | |||||
| | * | convert: add "status=delayed" to filter process protocol | Lars Schneider | 2017-06-30 | 9 | -90/+575 |
| | * | convert: refactor capabilities negotiation | Lars Schneider | 2017-06-30 | 1 | -12/+27 |
| | * | convert: move multiple file filter error handling to separate function | Lars Schneider | 2017-06-29 | 1 | -21/+26 |
| | * | convert: put the flags field before the flag itself for consistent style | Lars Schneider | 2017-06-29 | 1 | -5/+5 |
| | * | t0021: write "OUT <size>" only on success | Lars Schneider | 2017-06-29 | 2 | -6/+6 |
| | * | t0021: make debug log file name configurable | Lars Schneider | 2017-06-26 | 2 | -25/+27 |
| | * | t0021: keep filter log files on comparison | Lars Schneider | 2017-06-26 | 1 | -6/+6 |
* | | | Merge branch 'dc/fmt-merge-msg-microcleanup' into maint | Junio C Hamano | 2017-08-23 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | fmt-merge-msg: fix coding style | Dimitrios Christidis | 2017-07-25 | 1 | -1/+2 |
* | | | | Merge branch 'ah/doc-wserrorhighlight' into maint | Junio C Hamano | 2017-08-23 | 2 | -13/+15 |
|\ \ \ \ | |||||
| * | | | | doc: add missing values "none" and "default" for diff.wsErrorHighlight | Andreas Heiduk | 2017-07-25 | 2 | -13/+15 |
| |/ / / | |||||
* | | | | Merge branch 'cc/ref-is-hidden-microcleanup' into maint | Junio C Hamano | 2017-08-23 | 1 | -5/+4 |
|\ \ \ \ | |||||
| * | | | | refs: use skip_prefix() in ref_is_hidden() | Christian Couder | 2017-07-24 | 1 | -5/+4 |
| |/ / / | |||||
* | | | | Merge branch 'js/run-process-parallel-api-fix' into maint | Junio C Hamano | 2017-08-23 | 2 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | run_processes_parallel: change confusing task_cb convention | Johannes Schindelin | 2017-07-21 | 2 | -3/+3 |
* | | | | | Merge branch 'rs/pack-objects-pbase-cleanup' into maint | Junio C Hamano | 2017-08-23 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | pack-objects: remove unnecessary NULL check | René Scharfe | 2017-07-20 | 1 | -1/+1 |
* | | | | | | Merge branch 'jt/fsck-code-cleanup' into maint | Junio C Hamano | 2017-08-23 | 3 | -27/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fsck: cleanup unused variable | Jonathan Tan | 2017-07-26 | 1 | -3/+1 |
| * | | | | | | object: remove "used" field from struct object | Jonathan Tan | 2017-07-20 | 3 | -12/+15 |
| * | | | | | | fsck: remove redundant parse_tree() invocation | Jonathan Tan | 2017-07-20 | 1 | -12/+1 |
* | | | | | | | Merge branch 'rs/stat-data-unaligned-reads-fix' into maint | Junio C Hamano | 2017-08-23 | 1 | -23/+27 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | dir: support platforms that require aligned reads | René Scharfe | 2017-07-17 | 1 | -23/+27 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rs/move-array' into maint | Junio C Hamano | 2017-08-23 | 11 | -30/+44 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | ls-files: don't try to prune an empty index | René Scharfe | 2017-07-17 | 1 | -1/+1 |
| * | | | | | | | apply: use COPY_ARRAY and MOVE_ARRAY in update_image() | René Scharfe | 2017-07-17 | 1 | -7/+4 |
| * | | | | | | | use MOVE_ARRAY | René Scharfe | 2017-07-17 | 9 | -26/+17 |
| * | | | | | | | add MOVE_ARRAY | René Scharfe | 2017-07-17 | 2 | -0/+25 |
* | | | | | | | | Merge branch 'rs/bswap-ubsan-fix' into maint | Junio C Hamano | 2017-08-23 | 1 | -14/+24 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | bswap: convert get_be16, get_be32 and put_be32 to inline functions | René Scharfe | 2017-07-17 | 1 | -14/+24 |
| * | | | | | | | | bswap: convert to unsigned before shifting in get_be32 | René Scharfe | 2017-07-17 | 1 | -4/+4 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'dl/credential-cache-socket-in-xdg-cache' into maint | Junio C Hamano | 2017-08-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | credential-cache: interpret an ECONNRESET as an EOF | Ramsay Jones | 2017-07-27 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'hb/gitweb-project-list' into maint | Junio C Hamano | 2017-08-23 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | gitweb: skip unreadable subdirectories | Hielke Christian Braun | 2017-07-18 | 1 | -0/+2 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ks/commit-abort-on-empty-message-fix' into maint | Junio C Hamano | 2017-08-23 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | commit: check for empty message before the check for untouched template | Kaartic Sivaraam | 2017-07-18 | 1 | -5/+5 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jk/reflog-walk' into maint | Junio C Hamano | 2017-08-23 | 8 | -123/+253 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | reflog-walk: apply --since/--until to reflog dates | Jeff King | 2017-07-09 | 4 | -3/+55 |
| * | | | | | | | | | reflog-walk: stop using fake parents | Jeff King | 2017-07-09 | 5 | -108/+75 |