Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ak/pretty-decorate-more-fix' | Junio C Hamano | 2023-10-21 | 2 | -3/+7 |
|\ | |||||
| * | pretty: fix ref filtering for %(decorate) formats | Andy Koppe | 2023-10-09 | 2 | -3/+7 |
* | | Merge branch 'vd/loose-ref-iteration-optimization' | Junio C Hamano | 2023-10-21 | 7 | -49/+112 |
|\ \ | |||||
| * | | files-backend.c: avoid stat in 'loose_fill_ref_dir' | Victoria Dye | 2023-10-10 | 1 | -9/+5 |
| * | | dir.[ch]: add 'follow_symlink' arg to 'get_dtype' | Victoria Dye | 2023-10-10 | 3 | -8/+18 |
| * | | dir.[ch]: expose 'get_dtype' | Victoria Dye | 2023-10-10 | 3 | -36/+39 |
| * | | ref-cache.c: fix prefix matching in ref iteration | Victoria Dye | 2023-10-10 | 3 | -1/+55 |
* | | | Merge branch 'ty/merge-tree-strategy-options' | Junio C Hamano | 2023-10-21 | 4 | -3/+59 |
|\ \ \ | |||||
| * | | | merge: introduce {copy|clear}_merge_options() | Junio C Hamano | 2023-10-11 | 3 | -1/+22 |
| * | | | merge-tree: add -X strategy option | Tang Yuyi | 2023-09-25 | 2 | -3/+38 |
* | | | | The nineteenth batch | Junio C Hamano | 2023-10-18 | 1 | -1/+9 |
* | | | | Merge branch 'jc/merge-ort-attr-index-fix' | Junio C Hamano | 2023-10-18 | 2 | -0/+28 |
|\ \ \ \ | |||||
| * | | | | merge-ort: initialize repo in index state | John Cai | 2023-10-09 | 2 | -0/+28 |
* | | | | | Merge branch 'sn/cat-file-doc-update' | Junio C Hamano | 2023-10-18 | 2 | -19/+17 |
|\ \ \ \ \ | |||||
| * | | | | | doc/cat-file: make synopsis and description less confusing | Štěpán Němec | 2023-10-09 | 2 | -19/+17 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'xz/commit-title-soft-limit-doc' | Junio C Hamano | 2023-10-18 | 3 | -6/+6 |
|\ \ \ \ \ | |||||
| * | | | | | doc: correct the 50 characters soft limit (+) | 谢致邦 (XIE Zhibang) | 2023-10-09 | 3 | -6/+6 |
* | | | | | | Merge branch 'tb/repack-max-cruft-size' | Junio C Hamano | 2023-10-18 | 8 | -136/+645 |
|\ \ \ \ \ \ | |||||
| * | | | | | | repack: free existing_cruft array after use | Jeff King | 2023-10-09 | 1 | -0/+1 |
| * | | | | | | builtin/repack.c: avoid making cruft packs preferred | Taylor Blau | 2023-10-05 | 2 | -1/+85 |
| * | | | | | | builtin/repack.c: implement support for `--max-cruft-size` | Taylor Blau | 2023-10-05 | 7 | -11/+426 |
| * | | | | | | builtin/repack.c: parse `--max-pack-size` with OPT_MAGNITUDE | Taylor Blau | 2023-10-05 | 1 | -3/+3 |
| * | | | | | | t7700: split cruft-related tests to t7704 | Taylor Blau | 2023-10-03 | 2 | -121/+130 |
* | | | | | | | The eighteenth batch | Junio C Hamano | 2023-10-13 | 1 | -0/+21 |
* | | | | | | | Merge branch 'jk/decoration-and-other-leak-fixes' | Junio C Hamano | 2023-10-13 | 10 | -16/+74 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | daemon: free listen_addr before returning | Jeff King | 2023-10-05 | 2 | -16/+23 |
| * | | | | | | | revision: clear decoration structs during release_revisions() | Jeff King | 2023-10-05 | 4 | -0/+22 |
| * | | | | | | | decorate: add clear_decoration() function | Jeff King | 2023-10-05 | 4 | -0/+29 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ar/diff-index-merge-base-fix' | Junio C Hamano | 2023-10-13 | 2 | -5/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | diff: fix --merge-base with annotated tags | Alyssa Ross | 2023-10-02 | 2 | -5/+10 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'js/submodule-fix-misuse-of-path-and-name' | Junio C Hamano | 2023-10-13 | 3 | -22/+90 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7420: test that we correctly handle renamed submodules | Jan Alexander Steffens (heftig) | 2023-10-04 | 1 | -2/+24 |
| * | | | | | | | t7419: test that we correctly handle renamed submodules | Jan Alexander Steffens (heftig) | 2023-10-04 | 1 | -1/+29 |
| * | | | | | | | t7419, t7420: use test_cmp_config instead of grepping .gitmodules | Jan Alexander Steffens (heftig) | 2023-10-04 | 2 | -6/+6 |
| * | | | | | | | t7419: actually test the branch switching | Jan Alexander Steffens (heftig) | 2023-10-04 | 1 | -6/+8 |
| * | | | | | | | submodule--helper: return error from set-url when modifying failed | Jan Alexander Steffens (heftig) | 2023-10-04 | 1 | -5/+7 |
| * | | | | | | | submodule--helper: use submodule_from_path in set-{url,branch} | Jan Alexander Steffens (heftig) | 2023-10-04 | 1 | -4/+18 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/commit-graph-leak-fixes' | Junio C Hamano | 2023-10-13 | 18 | -22/+42 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit-graph: clear oidset after finishing write | Jeff King | 2023-10-03 | 2 | -0/+3 |
| * | | | | | | | commit-graph: free write-context base_graph_name during cleanup | Jeff King | 2023-10-03 | 2 | -0/+3 |
| * | | | | | | | commit-graph: free write-context entries before overwriting | Jeff King | 2023-10-03 | 1 | -0/+2 |
| * | | | | | | | commit-graph: free graph struct that was not added to chain | Jeff King | 2023-10-03 | 1 | -0/+2 |
| * | | | | | | | commit-graph: delay base_graph assignment in add_graph_to_chain() | Jeff King | 2023-10-03 | 1 | -2/+2 |
| * | | | | | | | commit-graph: free all elements of graph chain | Jeff King | 2023-10-03 | 1 | -18/+11 |
| * | | | | | | | commit-graph: move slab-clearing to close_commit_graph() | Jeff King | 2023-10-03 | 1 | -1/+1 |
| * | | | | | | | merge: free result of repo_get_merge_bases() | Jeff King | 2023-10-03 | 11 | -1/+14 |
| * | | | | | | | commit-reach: free temporary list in get_octopus_merge_bases() | Jeff King | 2023-10-03 | 2 | -0/+2 |
| * | | | | | | | t6700: mark test as leak-free | Jeff King | 2023-10-03 | 1 | -0/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'la/trailer-test-and-doc-updates' | Junio C Hamano | 2023-10-13 | 3 | -156/+545 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | trailer doc: <token> is a <key> or <keyAlias>, not both | Linus Arver | 2023-09-08 | 2 | -61/+77 |