aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'po/read-graft-line'Junio C Hamano2017-09-06
|\
| * commit: replace the raw buffer with strbuf in read_graft_linePatryk Obara2017-08-18
* | Merge branch 'ks/branch-set-upstream'Junio C Hamano2017-09-06
|\ \
| * | builtin/branch: stop supporting the "--set-upstream" optionKaartic Sivaraam2017-08-17
| |/
* | Merge branch 'mg/killed-merge'Junio C Hamano2017-08-26
|\ \
| * | merge: save merge state earlierMichael J Gruber2017-08-23
| * | merge: split write_merge_state in twoMichael J Gruber2017-08-23
| * | merge: clarify call chainMichael J Gruber2017-08-23
* | | Merge branch 'jt/packmigrate'Junio C Hamano2017-08-26
|\ \ \
| * | | pack: move for_each_packed_object()Jonathan Tan2017-08-23
| * | | pack: move has_sha1_pack()Jonathan Tan2017-08-23
| * | | pack: move {,re}prepare_packed_git and approximate_object_countJonathan Tan2017-08-23
| * | | pack: move pack-closing functionsJonathan Tan2017-08-23
| * | | pack: move open_pack_index(), parse_pack_index()Jonathan Tan2017-08-23
| * | | pack: move pack name-related functionsJonathan Tan2017-08-23
* | | | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-26
|\ \ \ \
| * | | | submodule: remove gitmodules_configBrandon Williams2017-08-03
| * | | | submodule-config: lazy-load a repository's .gitmodules fileBrandon Williams2017-08-03
| * | | | submodule-config: move submodule-config functions to submodule-config.cBrandon Williams2017-08-03
| * | | | submodule: remove submodule_config callback routineBrandon Williams2017-08-03
| * | | | unpack-trees: don't respect submodule.updateBrandon Williams2017-08-03
| * | | | fetch: don't overlay config with submodule-configBrandon Williams2017-08-03
| * | | | submodule--helper: don't overlay config in update-cloneBrandon Williams2017-08-03
| * | | | submodule--helper: don't overlay config in remote_submodule_branchBrandon Williams2017-08-03
| * | | | add, reset: ensure submodules can be added or resetBrandon Williams2017-08-02
| * | | | Merge branch 'bc/object-id' into bw/submodule-config-cleanupJunio C Hamano2017-08-02
| |\ \ \ \
| * \ \ \ \ Merge branch 'bw/grep-recurse-submodules' into bw/submodule-config-cleanupJunio C Hamano2017-08-02
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'po/object-id'Junio C Hamano2017-08-26
|\ \ \ \ \ \
| * | | | | | sha1_file: convert hash_sha1_file_literally to struct object_idPatryk Obara2017-08-20
| * | | | | | sha1_file: convert index_fd to struct object_idPatryk Obara2017-08-20
| * | | | | | sha1_file: convert index_path to struct object_idPatryk Obara2017-08-20
| * | | | | | builtin/hash-object: convert to struct object_idPatryk Obara2017-08-20
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jk/trailers-parse'Junio C Hamano2017-08-26
|\ \ \ \ \ \
| * | | | | | interpret-trailers: add --parse convenience optionJeff King2017-08-15
| * | | | | | interpret-trailers: add an option to unfold valuesJeff King2017-08-15
| * | | | | | interpret-trailers: add an option to show only existing trailersJeff King2017-08-15
| * | | | | | interpret-trailers: add an option to show only the trailersJeff King2017-08-15
| * | | | | | trailer: put process_trailers() options into a structJeff King2017-08-10
* | | | | | | Merge branch 'pb/trailers-from-command-line'Junio C Hamano2017-08-26
|\ \ \ \ \ \ \
| * | | | | | | interpret-trailers: add options for actionsPaolo Bonzini2017-08-14
| * | | | | | | trailers: introduce struct new_trailer_itemPaolo Bonzini2017-08-14
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jc/simplify-progress'Junio C Hamano2017-08-24
|\ \ \ \ \ \ \
| * | | | | | | progress: simplify "delayed" progress APIJunio C Hamano2017-08-19
| |/ / / / / /
* | | | | | | Merge branch 'rs/object-id'Junio C Hamano2017-08-24
|\ \ \ \ \ \ \
| * | | | | | | tree-walk: convert fill_tree_descriptor() to object_idRené Scharfe2017-08-14
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'lg/merge-signoff'Junio C Hamano2017-08-24
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | merge: add a --signoff flagŁukasz Gryglicki2017-07-25
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'kw/commit-keep-index-when-pre-commit-is-not-run'Junio C Hamano2017-08-23
|\ \ \ \ \ \
| * | | | | | commit: skip discarding the index if there is no pre-commit hookKevin Willford2017-08-16
* | | | | | | Merge branch 'kw/rebase-progress'Junio C Hamano2017-08-23
|\ \ \ \ \ \ \