Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mg/killed-merge' | Junio C Hamano | 2017-08-26 | 1 | -3/+12 |
|\ | |||||
| * | merge: save merge state earliermg/killed-merge | Michael J Gruber | 2017-08-23 | 1 | -0/+2 |
| * | 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 |
* | | Merge branch 'jt/packmigrate' | Junio C Hamano | 2017-08-26 | 13 | -0/+13 |
|\ \ | |||||
| * | | pack: move for_each_packed_object() | Jonathan Tan | 2017-08-23 | 1 | -0/+1 |
| * | | pack: move has_sha1_pack() | Jonathan Tan | 2017-08-23 | 1 | -0/+1 |
| * | | pack: move {,re}prepare_packed_git and approximate_object_count | Jonathan Tan | 2017-08-23 | 1 | -0/+1 |
| * | | pack: move pack-closing functions | Jonathan Tan | 2017-08-23 | 5 | -0/+5 |
| * | | pack: move open_pack_index(), parse_pack_index() | Jonathan Tan | 2017-08-23 | 3 | -0/+3 |
| * | | pack: move pack name-related functions | Jonathan Tan | 2017-08-23 | 2 | -0/+2 |
* | | | Merge branch 'bw/submodule-config-cleanup' | Junio C Hamano | 2017-08-26 | 15 | -50/+33 |
|\ \ \ | |||||
| * | | | submodule: remove gitmodules_config | Brandon Williams | 2017-08-03 | 13 | -35/+0 |
| * | | | submodule-config: lazy-load a repository's .gitmodules file | Brandon Williams | 2017-08-03 | 1 | -5/+0 |
| * | | | submodule-config: move submodule-config functions to submodule-config.c | Brandon Williams | 2017-08-03 | 1 | -0/+1 |
| * | | | submodule: remove submodule_config callback routine | Brandon Williams | 2017-08-03 | 1 | -1/+0 |
| * | | | unpack-trees: don't respect submodule.update | Brandon Williams | 2017-08-03 | 1 | -1/+1 |
| * | | | fetch: don't overlay config with submodule-config | Brandon Williams | 2017-08-03 | 1 | -1/+0 |
| * | | | submodule--helper: don't overlay config in update-clone | Brandon Williams | 2017-08-03 | 1 | -4/+19 |
| * | | | submodule--helper: don't overlay config in remote_submodule_branch | Brandon Williams | 2017-08-03 | 1 | -4/+11 |
| * | | | add, reset: ensure submodules can be added or reset | Brandon Williams | 2017-08-02 | 2 | -0/+2 |
| * | | | Merge branch 'bc/object-id' into bw/submodule-config-cleanup | Junio C Hamano | 2017-08-02 | 18 | -92/+92 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'bw/grep-recurse-submodules' into bw/submodule-config-cleanup | Junio C Hamano | 2017-08-02 | 5 | -318/+125 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'po/object-id' | Junio C Hamano | 2017-08-26 | 4 | -9/+9 |
|\ \ \ \ \ | |||||
| * | | | | | sha1_file: convert hash_sha1_file_literally to struct object_id | Patryk Obara | 2017-08-20 | 1 | -1/+1 |
| * | | | | | sha1_file: convert index_fd to struct object_id | Patryk Obara | 2017-08-20 | 3 | -3/+3 |
| * | | | | | sha1_file: convert index_path to struct object_id | Patryk Obara | 2017-08-20 | 1 | -1/+1 |
| * | | | | | builtin/hash-object: convert to struct object_id | Patryk Obara | 2017-08-20 | 1 | -6/+6 |
* | | | | | | Merge branch 'jk/trailers-parse' | Junio C Hamano | 2017-08-26 | 1 | -7/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | interpret-trailers: add --parse convenience option | Jeff King | 2017-08-15 | 1 | -0/+12 |
| * | | | | | | interpret-trailers: add an option to unfold values | Jeff King | 2017-08-15 | 1 | -0/+1 |
| * | | | | | | interpret-trailers: add an option to show only existing trailers | Jeff King | 2017-08-15 | 1 | -0/+7 |
| * | | | | | | interpret-trailers: add an option to show only the trailers | Jeff King | 2017-08-15 | 1 | -0/+1 |
| * | | | | | | trailer: put process_trailers() options into a struct | Jeff King | 2017-08-10 | 1 | -7/+6 |
* | | | | | | | Merge branch 'pb/trailers-from-command-line' | Junio C Hamano | 2017-08-26 | 1 | -4/+69 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | interpret-trailers: add options for actions | Paolo Bonzini | 2017-08-14 | 1 | -0/+32 |
| * | | | | | | | trailers: introduce struct new_trailer_item | Paolo Bonzini | 2017-08-14 | 1 | -4/+37 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/simplify-progress' | Junio C Hamano | 2017-08-24 | 6 | -8/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | progress: simplify "delayed" progress APIjc/simplify-progress | Junio C Hamano | 2017-08-19 | 5 | -7/+5 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'rs/object-id' | Junio C Hamano | 2017-08-24 | 2 | -8/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | tree-walk: convert fill_tree_descriptor() to object_idrs/object-id | René Scharfe | 2017-08-14 | 2 | -8/+8 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'lg/merge-signoff' | Junio C Hamano | 2017-08-24 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | merge: add a --signoff flaglg/merge-signoff | Łukasz Gryglicki | 2017-07-25 | 1 | -0/+4 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'kw/commit-keep-index-when-pre-commit-is-not-run' | Junio C Hamano | 2017-08-23 | 1 | -6/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | commit: skip discarding the index if there is no pre-commit hookkw/commit-keep-index-when-pre-commit-is-not-run | Kevin Willford | 2017-08-16 | 1 | -6/+9 |
* | | | | | | | Merge branch 'kw/rebase-progress' | Junio C Hamano | 2017-08-23 | 1 | -0/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | format-patch: have progress option while generating patches | Kevin Willford | 2017-08-14 | 1 | -0/+10 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rs/merge-microcleanup' | Junio C Hamano | 2017-08-22 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | merge: use skip_prefix()rs/merge-microcleanup | René Scharfe | 2017-08-10 | 1 | -2/+2 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rs/fsck-obj-leakfix' | Junio C Hamano | 2017-08-22 | 1 | -11/+11 |
|\ \ \ \ \ \ \ |