summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jc/simplify-progress'Junio C Hamano2017-08-246-8/+6
|\ \ \ \ \ \ \
| * | | | | | | progress: simplify "delayed" progress APIjc/simplify-progressJunio C Hamano2017-08-195-7/+5
| |/ / / / / /
* | | | | | | Merge branch 'rs/object-id'Junio C Hamano2017-08-242-8/+8
|\ \ \ \ \ \ \
| * | | | | | | tree-walk: convert fill_tree_descriptor() to object_idrs/object-idRené Scharfe2017-08-142-8/+8
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'lg/merge-signoff'Junio C Hamano2017-08-241-0/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | merge: add a --signoff flaglg/merge-signoffŁukasz Gryglicki2017-07-251-0/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'kw/commit-keep-index-when-pre-commit-is-not-run'Junio C Hamano2017-08-231-6/+9
|\ \ \ \ \ \
| * | | | | | commit: skip discarding the index if there is no pre-commit hookkw/commit-keep-index-when-pre-commit-is-not-runKevin Willford2017-08-161-6/+9
* | | | | | | Merge branch 'kw/rebase-progress'Junio C Hamano2017-08-231-0/+10
|\ \ \ \ \ \ \
| * | | | | | | format-patch: have progress option while generating patchesKevin Willford2017-08-141-0/+10
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'rs/merge-microcleanup'Junio C Hamano2017-08-221-2/+2
|\ \ \ \ \ \ \
| * | | | | | | merge: use skip_prefix()rs/merge-microcleanupRené Scharfe2017-08-101-2/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'rs/fsck-obj-leakfix'Junio C Hamano2017-08-221-11/+11
|\ \ \ \ \ \ \