Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2024-01-09Merge branch 'en/header-cleanup'Junio C Hamano
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren
2023-11-27i18n: factorize even more 'incompatible options' messagesRené Scharfe
2023-10-11merge: introduce {copy|clear}_merge_options()Junio C Hamano
2023-09-26merge-tree: add -X strategy optionTang Yuyi
2023-07-14merge-tree: mark unused parameter in traverse callbackJeff King
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren
2023-06-03surround %s with quotes when failed to lookup commitTeng Long
2023-05-15Merge branch 'ds/merge-tree-use-config'Junio C Hamano
2023-05-10merge-tree: load default git configDerrick Stolee
2023-04-24commit.h: reduce unnecessary includesElijah Newren
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano
2023-03-28cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren
2023-02-24cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren
2022-12-26Merge branch 'jk/unused-post-2.39'Junio C Hamano
2022-12-14Merge branch 'kz/merge-tree-merge-base'Junio C Hamano
2022-12-13diff: mark unused parameters in callbacksJeff King
2022-11-21{builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"Ævar Arnfjörð Bjarmason
2022-11-13merge-tree.c: allow specifying the merge-base when --stdin is passedKyle Zhao
2022-11-13merge-tree.c: add --merge-base=<commit> optionKyle Zhao
2022-10-23merge-tree: support multiple batched merges with --stdinElijah Newren
2022-06-23merge-tree: add a --allow-unrelated-histories flagElijah Newren
2022-06-23merge-tree: allow `ls-files -u` style info to be NUL terminatedElijah Newren
2022-06-23merge-ort: optionally produce machine-readable outputElijah Newren
2022-06-23merge-tree: provide easy access to `ls-files -u` style infoElijah Newren
2022-06-23merge-tree: provide a list of which files have conflictsElijah Newren
2022-06-23merge-tree: support including merge messages in outputElijah Newren
2022-06-23merge-tree: implement real mergesElijah Newren
2022-06-23merge-tree: add option parsing and initial shell for real merge functionElijah Newren
2022-06-23merge-tree: move logic for existing merge into new functionElijah Newren
2022-06-23merge-tree: rename merge_trees() to trivial_merge_trees()Elijah Newren
2021-05-11xdiff users: use designated initializers for out_lineÆvar Arnfjörð Bjarmason
2020-10-20merge-base, xdiff: zero out xpparam_t structuresMichał Kępień
2019-08-22Merge branch 'jk/tree-walk-overflow'Junio C Hamano
2019-08-01tree-walk: add a strbuf wrapper for make_traverse_path()Jeff King
2019-08-01tree-walk: accept a raw length for traverse_path_len()Jeff King
2019-07-31tree-walk: drop oid from traverse_infoJeff King
2019-07-31setup_traverse_info(): stop copying oidJeff King
2019-06-27tree-walk.c: remove the_repo from fill_tree_descriptor()Nguyễn Thái Ngọc Duy
2019-02-07Merge branch 'nd/the-index-final'Junio C Hamano
2019-01-29Merge branch 'bc/tree-walk-oid'Junio C Hamano
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy
2019-01-15tree-walk: store object_id in a separate memberbrian m. carlson
2018-11-19tree-walk.c: make tree_entry_interesting() take an indexNguyễn Thái Ngọc Duy
2018-11-13Merge branch 'jk/xdiff-interface'Junio C Hamano
2018-11-02xdiff: provide a separate emit callback for hunksJeff King