Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t5601: rm the target file of cp that could still be executingjc/t5601-copy-workaround | Junio C Hamano | 2017-10-17 | 1 | -0/+2 |
* | Crawling towards -rc2 | Junio C Hamano | 2017-10-17 | 1 | -0/+1 |
* | Merge branch 'sb/diff-color-move' | Junio C Hamano | 2017-10-17 | 2 | -13/+24 |
|\ | |||||
| * | diff: fix infinite loop with --color-moved --ignore-space-changesb/diff-color-move | Jeff King | 2017-10-16 | 2 | -13/+24 |
* | | Merge branch 'js/rebase-i-final' | Junio C Hamano | 2017-10-17 | 1 | -2/+2 |
|\ \ | |||||
| * | | sequencer.c: fix and unify error messages in rearrange_squash() | Ralf Thielow | 2017-10-16 | 1 | -2/+2 |
* | | | Merge branch 'jc/doc-checkout' | Junio C Hamano | 2017-10-17 | 1 | -14/+16 |
|\ \ \ | |||||
| * | | | checkout doc: clarify command line args for "checkout paths" modejc/doc-checkout | Junio C Hamano | 2017-10-11 | 1 | -14/+16 |
* | | | | Git 2.15-rc1v2.15.0-rc1 | Junio C Hamano | 2017-10-11 | 2 | -1/+18 |
* | | | | Merge branch 'ls/filter-process-delayed' | Junio C Hamano | 2017-10-11 | 1 | -36/+52 |
|\ \ \ \ | |||||
| * | | | | write_entry: untangle symlink and regular-file casesls/filter-process-delayed | Jeff King | 2017-10-10 | 1 | -31/+40 |
| * | | | | write_entry: avoid reading blobs in CE_RETRY case | Jeff King | 2017-10-10 | 1 | -11/+14 |
| * | | | | write_entry: fix leak when retrying delayed filter | Jeff King | 2017-10-10 | 1 | -0/+1 |
| * | | | | entry.c: check if file exists after checkout | Lars Schneider | 2017-10-06 | 1 | -1/+3 |
| * | | | | entry.c: update cache entry only for existing files | Lars Schneider | 2017-10-05 | 1 | -1/+2 |
* | | | | | Merge branch 'ds/avoid-overflow-in-midpoint-computation' | Junio C Hamano | 2017-10-11 | 12 | -15/+15 |
|\ \ \ \ \ | |||||
| * | | | | | cleanup: fix possible overflow errors in binary searchds/avoid-overflow-in-midpoint-computation | Derrick Stolee | 2017-10-10 | 12 | -15/+15 |
* | | | | | | Merge branch 'tb/complete-describe' | Junio C Hamano | 2017-10-11 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | completion: add --broken and --dirty to describetb/complete-describe | Thomas Braun | 2017-10-07 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'sb/test-cmp-expect-actual' | Junio C Hamano | 2017-10-11 | 14 | -41/+41 |
|\ \ \ \ \ \ | |||||
| * | | | | | | tests: fix diff order arguments in test_cmpsb/test-cmp-expect-actual | Stefan Beller | 2017-10-07 | 15 | -42/+42 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'jk/refs-df-conflict' | Junio C Hamano | 2017-10-11 | 4 | -3/+50 |
|\ \ \ \ \ \ | |||||
| * | | | | | | refs_resolve_ref_unsafe: handle d/f conflicts for writesjk/refs-df-conflict | Jeff King | 2017-10-07 | 3 | -2/+49 |
| * | | | | | | t3308: create a real ref directory/file conflict | Jeff King | 2017-10-07 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'rs/rs-mailmap' | Junio C Hamano | 2017-10-11 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | .mailmap: normalize name for René Scharfers/rs-mailmap | René Scharfe | 2017-10-06 | 1 | -0/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'rs/fsck-null-return-from-lookup' | Junio C Hamano | 2017-10-11 | 2 | -4/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fsck: handle NULL return of lookup_blob() and lookup_tree()rs/fsck-null-return-from-lookup | René Scharfe | 2017-10-06 | 2 | -4/+26 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jk/sha1-loose-object-info-fix' | Junio C Hamano | 2017-10-11 | 1 | -2/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | sha1_loose_object_info: handle errors from unpack_sha1_restjk/sha1-loose-object-info-fix | Jeff King | 2017-10-06 | 1 | -2/+6 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'hn/string-list-doc' | Junio C Hamano | 2017-10-11 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | api-argv-array.txt: remove broken link to string-list APIhn/string-list-doc | Todd Zullinger | 2017-10-06 | 1 | -1/+1 |
* | | | | | | | Merge branch 'tb/show-trailers-in-ref-filter' | Junio C Hamano | 2017-10-11 | 4 | -17/+122 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | ref-filter.c: parse trailers arguments with %(contents) atomtb/show-trailers-in-ref-filter | Taylor Blau | 2017-10-02 | 2 | -3/+42 |
| * | | | | | | | ref-filter.c: use trailer_opts to format trailers | Taylor Blau | 2017-10-02 | 3 | -10/+68 |
| * | | | | | | | t6300: refactor %(trailers) tests | Taylor Blau | 2017-10-02 | 1 | -2/+9 |
| * | | | | | | | doc: use "`<literal>`"-style quoting for literal strings | Taylor Blau | 2017-10-02 | 1 | -3/+3 |
| * | | | | | | | doc: 'trailers' is the preferred way to format trailers | Taylor Blau | 2017-10-02 | 1 | -1/+2 |
| * | | | | | | | t4205: unfold across multiple lines | Taylor Blau | 2017-10-02 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jt/oidmap' | Junio C Hamano | 2017-10-11 | 6 | -31/+133 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | oidmap: map with OID as keyjt/oidmap | Jonathan Tan | 2017-10-01 | 6 | -31/+133 |
* | | | | | | | | | Merge branch 'jr/hash-migration-plan-doc' | Junio C Hamano | 2017-10-11 | 2 | -0/+798 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | technical doc: add a design doc for hash function transitionjr/hash-migration-plan-doc | Jonathan Nieder | 2017-09-28 | 2 | -0/+798 |
* | | | | | | | | | | Merge branch 'js/rebase-i-final' | Junio C Hamano | 2017-10-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | i18n: add a missing space in message | Jean-Noel Avila | 2017-10-09 | 1 | -1/+1 |
* | | | | | | | | | | Prepare for -rc1 | Junio C Hamano | 2017-10-07 | 1 | -3/+38 |
* | | | | | | | | | | Merge branch 'tb/ref-filter-empty-modifier' | Junio C Hamano | 2017-10-07 | 2 | -1/+10 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | ref-filter.c: pass empty-string as NULL to atom parserstb/ref-filter-empty-modifier | Taylor Blau | 2017-10-05 | 2 | -1/+10 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'ks/verify-filename-non-option-error-message-tweak' | Junio C Hamano | 2017-10-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | setup: update error message to be more meaningfulks/verify-filename-non-option-error-message-tweak | Kaartic Sivaraam | 2017-10-04 | 1 | -1/+1 |
| |/ / / / / / / / / |