summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* hashmap: add API to disable item counting when threadedjh/hashmap-disable-countingJeff Hostetler2017-09-076-40/+88
* The fifth batch post 2.14Junio C Hamano2017-08-261-1/+49
* Merge branch 'mg/killed-merge'Junio C Hamano2017-08-263-4/+31
|\
| * merge: save merge state earliermg/killed-mergeMichael J Gruber2017-08-232-0/+17
| * merge: split write_merge_state in twoMichael J Gruber2017-08-231-3/+8
| * merge: clarify call chainMichael J Gruber2017-08-231-0/+2
| * Documentation/git-merge: explain --continueMichael J Gruber2017-08-211-1/+4
* | Merge branch 'jt/packmigrate'Junio C Hamano2017-08-2637-2014/+2081
|\ \
| * | pack: move for_each_packed_object()Jonathan Tan2017-08-236-46/+54
| * | pack: move has_pack_index()Jonathan Tan2017-08-234-10/+10
| * | pack: move has_sha1_pack()Jonathan Tan2017-08-237-8/+11
| * | pack: move find_pack_entry() and make it globalJonathan Tan2017-08-233-53/+55
| * | pack: move find_sha1_pack()Jonathan Tan2017-08-236-16/+18
| * | pack: move find_pack_entry_one(), is_pack_valid()Jonathan Tan2017-08-234-84/+82
| * | pack: move check_pack_index_ptr(), nth_packed_object_offset()Jonathan Tan2017-08-234-49/+49
| * | pack: move nth_packed_object_{sha1,oid}Jonathan Tan2017-08-234-46/+46
| * | pack: move clear_delta_base_cache(), packed_object_info(), unpack_entry()Jonathan Tan2017-08-234-670/+685
| * | pack: move unpack_object_header()Jonathan Tan2017-08-234-27/+27
| * | pack: move get_size_from_delta()Jonathan Tan2017-08-234-40/+41
| * | pack: move unpack_object_header_buffer()Jonathan Tan2017-08-234-26/+27
| * | pack: move {,re}prepare_packed_git and approximate_object_countJonathan Tan2017-08-2311-232/+238
| * | pack: move install_packed_git()Jonathan Tan2017-08-234-11/+12
| * | pack: move add_packed_git()Jonathan Tan2017-08-235-62/+55
| * | pack: move unuse_pack()Jonathan Tan2017-08-234-10/+10
| * | pack: move use_pack()Jonathan Tan2017-08-235-306/+298
| * | pack: move pack-closing functionsJonathan Tan2017-08-239-63/+70
| * | pack: move release_pack_memory()Jonathan Tan2017-08-234-51/+53
| * | pack: move open_pack_index(), parse_pack_index()Jonathan Tan2017-08-2310-148/+163
| * | pack: move pack_report()Jonathan Tan2017-08-234-26/+26
| * | pack: move static state variablesJonathan Tan2017-08-233-13/+23
| * | pack: move pack name-related functionsJonathan Tan2017-08-2310-45/+56
* | | Merge branch 'mh/ref-lock-entry'Junio C Hamano2017-08-264-5/+39
|\ \ \
| * | | refs: retry acquiring reference locks for 100msmh/ref-lock-entryMichael Haggerty2017-08-234-5/+39
| | |/ | |/|
* | | Merge branch 'jt/doc-pack-objects-fix'Junio C Hamano2017-08-261-6/+11
|\ \ \
| * | | Doc: clarify that pack-objects makes packs, pluraljt/doc-pack-objects-fixJonathan Tan2017-08-231-6/+11
* | | | Merge branch 'jc/cutoff-config'Junio C Hamano2017-08-265-31/+79
|\ \ \ \
| * | | | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedjc/cutoff-configJunio C Hamano2017-08-225-12/+31
| * | | | rerere: represent time duration in timestamp_t internallyJunio C Hamano2017-08-221-13/+23
| * | | | t4200: parameterize "rerere gc" custom expiry testJunio C Hamano2017-08-221-25/+33
| * | | | t4200: gather "rerere gc" togetherJunio C Hamano2017-08-221-27/+27
| * | | | t4200: make "rerere gc" test more robustJunio C Hamano2017-08-221-5/+14
| * | | | t4200: give us a clean slate after "rerere gc" testsJunio C Hamano2017-08-221-0/+2
| | |/ / | |/| |
* | | | Merge branch 'kw/write-index-reduce-alloc'Junio C Hamano2017-08-264-28/+87
|\ \ \ \
| * | | | read-cache: avoid allocating every ondisk entry when writingKevin Willford2017-08-211-25/+25
| * | | | read-cache: fix memory leak in do_write_indexKevin Willford2017-08-211-3/+9
| * | | | perf: add test for writing the indexKevin Willford2017-08-213-0/+53
* | | | | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-2625-373/+192
|\ \ \ \ \
| * | | | | submodule: remove gitmodules_configBrandon Williams2017-08-0316-53/+0
| * | | | | unpack-trees: improve loading of .gitmodulesBrandon Williams2017-08-031-16/+27
| * | | | | submodule-config: lazy-load a repository's .gitmodules fileBrandon Williams2017-08-032-10/+22