Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ls/convert-filter-progress' | Junio C Hamano | 2017-09-10 | 2 | -2/+15 |
|\ | |||||
| * | convert: display progress for filtered objects that have been delayedls/convert-filter-progress | Lars Schneider | 2017-08-24 | 2 | -2/+16 |
* | | Merge branch 'ma/up-to-date' | Junio C Hamano | 2017-09-10 | 30 | -44/+46 |
|\ \ | |||||
| * | | treewide: correct several "up-to-date" to "up to date"ma/up-to-date | Martin Ågren | 2017-08-23 | 30 | -40/+40 |
| * | | Documentation/user-manual: update outdated example output | Martin Ågren | 2017-08-23 | 1 | -4/+6 |
* | | | Merge branch 'ma/ts-cleanups' | Junio C Hamano | 2017-09-10 | 6 | -3/+37 |
|\ \ \ | |||||
| * | | | ThreadSanitizer: add suppressionsma/ts-cleanups | Martin Ågren | 2017-08-23 | 3 | -0/+24 |
| * | | | strbuf_setlen: don't write to strbuf_slopbuf | Martin Ågren | 2017-08-23 | 1 | -1/+4 |
| * | | | pack-objects: take lock before accessing `remaining` | Martin Ågren | 2017-08-23 | 1 | -0/+6 |
| * | | | convert: always initialize attr_action in convert_attrs | Martin Ågren | 2017-08-23 | 1 | -2/+3 |
| |/ / | |||||
* | | | The sixth batch post 2.14 | Junio C Hamano | 2017-09-06 | 1 | -0/+10 |
* | | | Merge branch 'rs/archive-excluded-directory' | Junio C Hamano | 2017-09-06 | 2 | -11/+85 |
|\ \ \ | |||||
| * | | | archive: don't queue excluded directories | René Scharfe | 2017-08-19 | 2 | -9/+27 |
| * | | | archive: factor out helper functions for handling attributes | René Scharfe | 2017-08-19 | 1 | -8/+23 |
| * | | | t5001: add tests for export-ignore attributes and exclude pathspecs | René Scharfe | 2017-08-19 | 1 | -3/+44 |
| |/ / | |||||
* | | | Merge branch 'po/read-graft-line' | Junio C Hamano | 2017-09-06 | 4 | -23/+29 |
|\ \ \ | |||||
| * | | | commit: rewrite read_graft_linepo/read-graft-line | Patryk Obara | 2017-08-18 | 1 | -15/+21 |
| * | | | commit: allocate array using object_id size | Patryk Obara | 2017-08-18 | 1 | -1/+2 |
| * | | | commit: replace the raw buffer with strbuf in read_graft_line | Patryk Obara | 2017-08-18 | 3 | -14/+13 |
| * | | | sha1_file: fix definition of null_sha1 | Patryk Obara | 2017-08-17 | 1 | -1/+1 |
* | | | | Merge branch 'ks/branch-set-upstream' | Junio C Hamano | 2017-09-06 | 5 | -92/+23 |
|\ \ \ \ | |||||
| * | | | | branch: quote branch/ref names to improve readabilityks/branch-set-upstream | Kaartic Sivaraam | 2017-08-17 | 1 | -8/+8 |
| * | | | | builtin/branch: stop supporting the "--set-upstream" option | Kaartic Sivaraam | 2017-08-17 | 4 | -84/+14 |
| * | | | | t3200: cleanup cruft of a test | Kaartic Sivaraam | 2017-08-17 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | The fifth batch post 2.14 | Junio C Hamano | 2017-08-26 | 1 | -1/+49 |
* | | | | Merge branch 'mg/killed-merge' | Junio C Hamano | 2017-08-26 | 3 | -4/+31 |
|\ \ \ \ | |||||
| * | | | | merge: save merge state earliermg/killed-merge | Michael J Gruber | 2017-08-23 | 2 | -0/+17 |
| * | | | | merge: split write_merge_state in two | Michael J Gruber | 2017-08-23 | 1 | -3/+8 |
| * | | | | merge: clarify call chain | Michael J Gruber | 2017-08-23 | 1 | -0/+2 |
| * | | | | Documentation/git-merge: explain --continue | Michael J Gruber | 2017-08-21 | 1 | -1/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jt/packmigrate' | Junio C Hamano | 2017-08-26 | 37 | -2014/+2081 |
|\ \ \ \ | |||||
| * | | | | pack: move for_each_packed_object() | Jonathan Tan | 2017-08-23 | 6 | -46/+54 |
| * | | | | pack: move has_pack_index() | Jonathan Tan | 2017-08-23 | 4 | -10/+10 |
| * | | | | pack: move has_sha1_pack() | Jonathan Tan | 2017-08-23 | 7 | -8/+11 |
| * | | | | pack: move find_pack_entry() and make it global | Jonathan Tan | 2017-08-23 | 3 | -53/+55 |
| * | | | | pack: move find_sha1_pack() | Jonathan Tan | 2017-08-23 | 6 | -16/+18 |
| * | | | | pack: move find_pack_entry_one(), is_pack_valid() | Jonathan Tan | 2017-08-23 | 4 | -84/+82 |
| * | | | | pack: move check_pack_index_ptr(), nth_packed_object_offset() | Jonathan Tan | 2017-08-23 | 4 | -49/+49 |
| * | | | | pack: move nth_packed_object_{sha1,oid} | Jonathan Tan | 2017-08-23 | 4 | -46/+46 |
| * | | | | pack: move clear_delta_base_cache(), packed_object_info(), unpack_entry() | Jonathan Tan | 2017-08-23 | 4 | -670/+685 |
| * | | | | pack: move unpack_object_header() | Jonathan Tan | 2017-08-23 | 4 | -27/+27 |
| * | | | | pack: move get_size_from_delta() | Jonathan Tan | 2017-08-23 | 4 | -40/+41 |
| * | | | | pack: move unpack_object_header_buffer() | Jonathan Tan | 2017-08-23 | 4 | -26/+27 |
| * | | | | pack: move {,re}prepare_packed_git and approximate_object_count | Jonathan Tan | 2017-08-23 | 11 | -232/+238 |
| * | | | | pack: move install_packed_git() | Jonathan Tan | 2017-08-23 | 4 | -11/+12 |
| * | | | | pack: move add_packed_git() | Jonathan Tan | 2017-08-23 | 5 | -62/+55 |
| * | | | | pack: move unuse_pack() | Jonathan Tan | 2017-08-23 | 4 | -10/+10 |
| * | | | | pack: move use_pack() | Jonathan Tan | 2017-08-23 | 5 | -306/+298 |
| * | | | | pack: move pack-closing functions | Jonathan Tan | 2017-08-23 | 9 | -63/+70 |
| * | | | | pack: move release_pack_memory() | Jonathan Tan | 2017-08-23 | 4 | -51/+53 |