summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/incore-lockfile-removal'Junio C Hamano2017-09-193-14/+11
|\
| * stop leaking lock structs in some simple casesjk/incore-lockfile-removalJeff King2017-09-062-10/+7
| * tempfile: auto-allocate tempfiles on heapJeff King2017-09-061-4/+4
* | Merge branch 'mg/timestamp-t-fix'Junio C Hamano2017-09-191-1/+1
|\ \
| * | name-rev: change ULONG_MAX to TIME_MAXmg/timestamp-t-fixMichael J Gruber2017-09-061-1/+1
* | | Merge branch 'ma/up-to-date'Junio C Hamano2017-09-101-2/+2
|\ \ \
| * | | treewide: correct several "up-to-date" to "up to date"ma/up-to-dateMartin Ågren2017-08-231-2/+2
* | | | Merge branch 'ma/ts-cleanups'Junio C Hamano2017-09-101-0/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | pack-objects: take lock before accessing `remaining`Martin Ågren2017-08-231-0/+6
| |/ /
* | | Merge branch 'po/read-graft-line'Junio C Hamano2017-09-061-1/+1
|\ \ \
| * | | commit: replace the raw buffer with strbuf in read_graft_linePatryk Obara2017-08-181-1/+1
* | | | Merge branch 'ks/branch-set-upstream'Junio C Hamano2017-09-061-22/+3
|\ \ \ \
| * | | | builtin/branch: stop supporting the "--set-upstream" optionKaartic Sivaraam2017-08-171-22/+3
| |/ / /
* | | | Merge branch 'mg/killed-merge'Junio C Hamano2017-08-261-3/+12
|\ \ \ \
| * | | | merge: save merge state earliermg/killed-mergeMichael J Gruber2017-08-231-0/+2
| * | | | merge: split write_merge_state in twoMichael J Gruber2017-08-231-3/+8
| * | | | merge: clarify call chainMichael J Gruber2017-08-231-0/+2
| | |/ / | |/| |
* | | | Merge branch 'jt/packmigrate'Junio C Hamano2017-08-2613-0/+13
|\ \ \ \
| * | | | pack: move for_each_packed_object()Jonathan Tan2017-08-231-0/+1
| * | | | pack: move has_sha1_pack()Jonathan Tan2017-08-231-0/+1
| * | | | pack: move {,re}prepare_packed_git and approximate_object_countJonathan Tan2017-08-231-0/+1
| * | | | pack: move pack-closing functionsJonathan Tan2017-08-235-0/+5
| * | | | pack: move open_pack_index(), parse_pack_index()Jonathan Tan2017-08-233-0/+3
| * | | | pack: move pack name-related functionsJonathan Tan2017-08-232-0/+2
* | | | | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-2615-50/+33
|\ \ \ \ \
| * | | | | submodule: remove gitmodules_configBrandon Williams2017-08-0313-35/+0
| * | | | | submodule-config: lazy-load a repository's .gitmodules fileBrandon Williams2017-08-031-5/+0
| * | | | | submodule-config: move submodule-config functions to submodule-config.cBrandon Williams2017-08-031-0/+1
| * | | | | submodule: remove submodule_config callback routineBrandon Williams2017-08-031-1/+0
| * | | | | unpack-trees: don't respect submodule.updateBrandon Williams2017-08-031-1/+1
| * | | | | fetch: don't overlay config with submodule-configBrandon Williams2017-08-031-1/+0
| * | | | | submodule--helper: don't overlay config in update-cloneBrandon Williams2017-08-031-4/+19
| * | | | | submodule--helper: don't overlay config in remote_submodule_branchBrandon Williams2017-08-031-4/+11
| * | | | | add, reset: ensure submodules can be added or resetBrandon Williams2017-08-022-0/+2
| * | | | | Merge branch 'bc/object-id' into bw/submodule-config-cleanupJunio C Hamano2017-08-0218-92/+92
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'bw/grep-recurse-submodules' into bw/submodule-config-cleanupJunio C Hamano2017-08-025-318/+125
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'po/object-id'Junio C Hamano2017-08-264-9/+9
|\ \ \ \ \ \ \
| * | | | | | | sha1_file: convert hash_sha1_file_literally to struct object_idPatryk Obara2017-08-201-1/+1
| * | | | | | | sha1_file: convert index_fd to struct object_idPatryk Obara2017-08-203-3/+3
| * | | | | | | sha1_file: convert index_path to struct object_idPatryk Obara2017-08-201-1/+1
| * | | | | | | builtin/hash-object: convert to struct object_idPatryk Obara2017-08-201-6/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jk/trailers-parse'Junio C Hamano2017-08-261-7/+27
|\ \ \ \ \ \ \
| * | | | | | | interpret-trailers: add --parse convenience optionJeff King2017-08-151-0/+12
| * | | | | | | interpret-trailers: add an option to unfold valuesJeff King2017-08-151-0/+1
| * | | | | | | interpret-trailers: add an option to show only existing trailersJeff King2017-08-151-0/+7
| * | | | | | | interpret-trailers: add an option to show only the trailersJeff King2017-08-151-0/+1
| * | | | | | | trailer: put process_trailers() options into a structJeff King2017-08-101-7/+6
* | | | | | | | Merge branch 'pb/trailers-from-command-line'Junio C Hamano2017-08-261-4/+69
|\ \ \ \ \ \ \ \
| * | | | | | | | interpret-trailers: add options for actionsPaolo Bonzini2017-08-141-0/+32
| * | | | | | | | trailers: introduce struct new_trailer_itemPaolo Bonzini2017-08-141-4/+37
| | |_|/ / / / / | |/| | | | | |