| Age | Commit message (Expand) | Author | Files | Lines |
|---|
| 2025-08-21 | Merge branch 'jc/strbuf-split' | Junio C Hamano | 1 | -14/+16 |
| 2025-08-02 | merge-tree: do not use strbuf_split*() | Junio C Hamano | 1 | -14/+16 |
| 2025-07-23 | config: move Git config parsing into "environment.c" | Patrick Steinhardt | 1 | -0/+1 |
| 2025-07-23 | config: drop `git_config()` wrapper | Patrick Steinhardt | 1 | -1/+1 |
| 2025-07-01 | odb: rename `repo_read_object_file()` | Patrick Steinhardt | 1 | -6/+6 |
| 2025-07-01 | object-store: rename files to "odb.{c,h}" | Patrick Steinhardt | 1 | -1/+1 |
| 2025-05-16 | merge-tree: add a new --quiet flag | Elijah Newren | 1 | -0/+18 |
| 2025-04-15 | object-store: merge "object-store-ll.h" and "object-store.h" | Patrick Steinhardt | 1 | -1/+1 |
| 2025-02-18 | merge-tree: only use basic merge config | Phillip Wood | 1 | -1/+1 |
| 2025-02-18 | merge-tree: remove redundant code | Phillip Wood | 1 | -5/+2 |
| 2025-02-18 | merge-tree --stdin: flush stdout to avoid deadlock | Phillip Wood | 1 | -0/+2 |
| 2024-12-06 | global: trivial conversions to fix `-Wsign-compare` warnings | Patrick Steinhardt | 1 | -4/+2 |
| 2024-12-06 | global: mark code units that generate warnings with `-Wsign-compare` | Patrick Steinhardt | 1 | -0/+2 |
| 2024-09-23 | Merge branch 'jc/pass-repo-to-builtins' | Junio C Hamano | 1 | -2/+5 |
| 2024-09-13 | builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h | John Cai | 1 | -1/+1 |
| 2024-09-13 | builtin: add a repository parameter for builtin functions | John Cai | 1 | -1/+4 |
| 2024-08-22 | builtin/merge-tree: fix leaking `-X` strategy options | Patrick Steinhardt | 1 | -3/+10 |
| 2024-07-13 | merge-recursive: honor diff.algorithm | Antonin Delpeuch | 1 | -1/+1 |
| 2024-06-11 | merge: fix leaking merge bases | Patrick Steinhardt | 1 | -0/+1 |
| 2024-04-18 | builtin: stop using `the_index` | Patrick Steinhardt | 1 | -2/+1 |
| 2024-04-12 | Merge branch 'js/merge-tree-3-trees' | Junio C Hamano | 1 | -1/+1 |
| 2024-04-12 | merge-tree: fix argument type of the `--merge-base` option | Johannes Schindelin | 1 | -1/+1 |
| 2024-03-11 | Merge branch 'js/merge-base-with-missing-commit' | Junio C Hamano | 1 | -2/+3 |
| 2024-03-07 | Merge branch 'js/merge-tree-3-trees' | Junio C Hamano | 1 | -17/+31 |
| 2024-02-29 | commit-reach(repo_get_merge_bases): pass on "missing commits" errors | Johannes Schindelin | 1 | -2/+3 |
| 2024-02-23 | Always check `parse_tree*()`'s return value | Johannes Schindelin | 1 | -0/+6 |
| 2024-01-29 | merge-tree: accept 3 trees as arguments | Johannes Schindelin | 1 | -17/+25 |
| 2024-01-08 | Merge branch 'en/header-cleanup' | Junio C Hamano | 1 | -1/+0 |
| 2023-12-26 | treewide: remove unnecessary includes in source files | Elijah Newren | 1 | -1/+0 |
| 2023-11-27 | i18n: factorize even more 'incompatible options' messages | René Scharfe | 1 | -1/+2 |
| 2023-10-11 | merge: introduce {copy|clear}_merge_options() | Junio C Hamano | 1 | -1/+3 |
| 2023-09-25 | merge-tree: add -X strategy option | Tang Yuyi | 1 | -3/+15 |
| 2023-07-13 | merge-tree: mark unused parameter in traverse callback | Jeff King | 1 | -1/+3 |
| 2023-06-21 | object-store-ll.h: split this header out of object-store.h | Elijah Newren | 1 | -1/+1 |
| 2023-06-03 | surround %s with quotes when failed to lookup commit | Teng Long | 1 | -1/+1 |
| 2023-05-15 | Merge branch 'ds/merge-tree-use-config' | Junio C Hamano | 1 | -0/+3 |
| 2023-05-10 | merge-tree: load default git config | Derrick Stolee | 1 | -0/+3 |
| 2023-04-24 | commit.h: reduce unnecessary includes | Elijah Newren | 1 | -0/+1 |
| 2023-04-11 | object-name.h: move declarations for object-name.c functions from cache.h | Elijah Newren | 1 | -0/+1 |
| 2023-04-04 | Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-... | Junio C Hamano | 1 | -7/+11 |
| 2023-03-28 | cocci: apply the "object-store.h" part of "the_repository.pending" | Ævar Arnfjörð Bjarmason | 1 | -3/+6 |
| 2023-03-28 | cocci: apply the "commit.h" part of "the_repository.pending" | Ævar Arnfjörð Bjarmason | 1 | -3/+3 |
| 2023-03-28 | cocci: apply the "commit-reach.h" part of "the_repository.pending" | Ævar Arnfjörð Bjarmason | 1 | -1/+2 |
| 2023-03-21 | treewide: be explicit about dependence on gettext.h | Elijah Newren | 1 | -0/+1 |
| 2023-02-23 | cache.h: remove dependence on hex.h; make other files include it explicitly | Elijah Newren | 1 | -0/+1 |
| 2022-12-26 | Merge branch 'jk/unused-post-2.39' | Junio C Hamano | 1 | -1/+1 |
| 2022-12-14 | Merge branch 'kz/merge-tree-merge-base' | Junio C Hamano | 1 | -12/+53 |
| 2022-12-13 | diff: mark unused parameters in callbacks | Jeff King | 1 | -1/+1 |
| 2022-11-21 | {builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE" | Ævar Arnfjörð Bjarmason | 1 | -1/+1 |
| 2022-11-12 | merge-tree.c: allow specifying the merge-base when --stdin is passed | Kyle Zhao | 1 | -2/+19 |
| 2022-11-12 | merge-tree.c: add --merge-base=<commit> option | Kyle Zhao | 1 | -11/+35 |
| 2022-10-22 | merge-tree: support multiple batched merges with --stdin | Elijah Newren | 1 | -3/+39 |
| 2022-06-22 | merge-tree: add a --allow-unrelated-histories flag | Elijah Newren | 1 | -1/+6 |
| 2022-06-22 | merge-tree: allow `ls-files -u` style info to be NUL terminated | Elijah Newren | 1 | -1/+3 |
| 2022-06-22 | merge-ort: optionally produce machine-readable output | Elijah Newren | 1 | -1/+2 |
| 2022-06-22 | merge-tree: provide easy access to `ls-files -u` style info | Elijah Newren | 1 | -1/+10 |
| 2022-06-22 | merge-tree: provide a list of which files have conflicts | Elijah Newren | 1 | -3/+23 |
| 2022-06-22 | merge-tree: support including merge messages in output | Elijah Newren | 1 | -2/+19 |
| 2022-06-22 | merge-tree: implement real merges | Elijah Newren | 1 | -1/+40 |
| 2022-06-22 | merge-tree: add option parsing and initial shell for real merge function | Elijah Newren | 1 | -9/+75 |
| 2022-06-22 | merge-tree: move logic for existing merge into new function | Elijah Newren | 1 | -4/+8 |
| 2022-06-22 | merge-tree: rename merge_trees() to trivial_merge_trees() | Elijah Newren | 1 | -4/+4 |
| 2021-05-11 | xdiff users: use designated initializers for out_line | Ævar Arnfjörð Bjarmason | 1 | -4/+1 |
| 2020-10-20 | merge-base, xdiff: zero out xpparam_t structures | Michał Kępień | 1 | -0/+1 |
| 2019-08-22 | Merge branch 'jk/tree-walk-overflow' | Junio C Hamano | 1 | -2/+3 |
| 2019-08-01 | tree-walk: add a strbuf wrapper for make_traverse_path() | Jeff King | 1 | -2/+3 |
| 2019-08-01 | tree-walk: accept a raw length for traverse_path_len() | Jeff King | 1 | -1/+1 |
| 2019-07-31 | tree-walk: drop oid from traverse_info | Jeff King | 1 | -1/+1 |
| 2019-07-31 | setup_traverse_info(): stop copying oid | Jeff King | 1 | -1/+1 |
| 2019-06-27 | tree-walk.c: remove the_repo from fill_tree_descriptor() | Nguyễn Thái Ngọc Duy | 1 | -9/+13 |
| 2019-02-06 | Merge branch 'nd/the-index-final' | Junio C Hamano | 1 | -1/+3 |
| 2019-01-29 | Merge branch 'bc/tree-walk-oid' | Junio C Hamano | 1 | -10/+10 |
| 2019-01-24 | cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch | Nguyễn Thái Ngọc Duy | 1 | -1/+3 |
| 2019-01-15 | tree-walk: store object_id in a separate member | brian m. carlson | 1 | -10/+10 |
| 2018-11-19 | tree-walk.c: make tree_entry_interesting() take an index | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
| 2018-11-13 | Merge branch 'jk/xdiff-interface' | Junio C Hamano | 1 | -1/+2 |
| 2018-11-02 | xdiff: provide a separate emit callback for hunks | Jeff King | 1 | -1/+2 |
| 2018-10-19 | Merge branch 'nd/the-index' | Junio C Hamano | 1 | -1/+1 |
| 2018-09-21 | merge-blobs.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
| 2018-08-29 | convert "oidcmp() == 0" to oideq() | Jeff King | 1 | -1/+1 |
| 2018-06-29 | blob: add repository argument to lookup_blob | Stefan Beller | 1 | -1/+2 |
| 2018-06-29 | Merge branch 'sb/object-store-grafts' into sb/object-store-lookup | Junio C Hamano | 1 | -0/+1 |
| 2018-05-16 | object-store: move object access functions to object-store.h | Stefan Beller | 1 | -0/+1 |
| 2018-04-11 | exec_cmd: rename to use dash in file name | Stefan Beller | 1 | -1/+1 |
| 2018-03-14 | sha1_file: convert read_sha1_file to struct object_id | brian m. carlson | 1 | -2/+3 |
| 2017-08-14 | tree-walk: convert fill_tree_descriptor() to object_id | René Scharfe | 1 | -6/+6 |
| 2017-07-17 | builtin/merge-tree: convert remaining caller of get_sha1 to object_id | brian m. carlson | 1 | -3/+3 |
| 2017-05-08 | Convert lookup_blob to struct object_id | brian m. carlson | 1 | -1/+1 |
| 2017-05-08 | Convert remaining callers of lookup_blob to object_id | brian m. carlson | 1 | -5/+5 |
| 2016-04-25 | struct name_entry: use struct object_id instead of unsigned char sha1[20] | brian m. carlson | 1 | -9/+9 |
| 2016-02-22 | use xmallocz to avoid size arithmetic | Jeff King | 1 | -1/+1 |
| 2015-11-20 | Remove get_object_hash. | brian m. carlson | 1 | -2/+2 |
| 2015-11-20 | Convert struct object to object_id | brian m. carlson | 1 | -1/+1 |
| 2015-11-20 | Add several uses of get_object_hash. | brian m. carlson | 1 | -2/+2 |
| 2015-09-28 | react to errors in xdi_diff | Jeff King | 1 | -1/+2 |
| 2014-09-02 | merge-tree: remove unused df_conflict arguments | René Scharfe | 1 | -12/+6 |
| 2013-05-06 | merge-tree: handle directory/empty conflict correctly | John Keeping | 1 | -1/+5 |
| 2013-04-28 | merge-tree: fix typo in "both changed identically" | John Keeping | 1 | -1/+1 |
| 2013-04-08 | merge-tree: don't print entries that match "local" | John Keeping | 1 | -13/+13 |
| 2013-03-27 | merge-tree: fix typo in merge-tree.c::unresolved | John Keeping | 1 | -1/+1 |
| 2012-12-26 | merge-tree: fix d/f conflicts | Junio C Hamano | 1 | -32/+40 |
| 2012-12-26 | merge-tree: add comments to clarify what these functions are doing | Junio C Hamano | 1 | -4/+22 |
| 2012-12-26 | merge-tree: lose unused "resolve_directories" | Junio C Hamano | 1 | -3/+0 |
| 2012-12-26 | merge-tree: lose unused "flags" from merge_list | Junio C Hamano | 1 | -2/+1 |
| 2012-12-09 | Which merge_file() function do you mean? | Junio C Hamano | 1 | -2/+2 |
| 2011-04-11 | sparse: Fix an "symbol 'merge_file' not decared" warning | Ramsay Jones | 1 | -2/+1 |
| 2011-03-22 | Fix sparse warnings | Stephen Boyd | 1 | -1/+1 |
| 2010-07-14 | merge-tree: fix where two branches share no changes | Will Palmer | 1 | -1/+2 |
| 2010-06-21 | Merge branch 'rs/diff-no-minimal' into maint | Junio C Hamano | 1 | -1/+1 |
| 2010-02-22 | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 1 | -0/+358 |
