summaryrefslogtreecommitdiff
path: root/notes-merge.c
AgeCommit message (Expand)Author
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren
2023-06-21merge-ll: rename from ll-mergeElijah Newren
2023-06-21repository: remove unnecessary include of path.hElijah Newren
2023-04-11treewide: remove cache.h inclusion due to object-file.h changesElijah Newren
2023-04-11object-file.h: move declarations for object-file.c functions from cache.hElijah Newren
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren
2023-04-11treewide: be explicit about dependence on advice.hElijah Newren
2023-04-11treewide: be explicit about dependence on trace.h & trace2.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-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-21wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren
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-03-17misc *.c: use designated initializers for struct assignmentsÆvar Arnfjörð Bjarmason
2022-02-25Merge branch 'ab/diff-free-more'Junio C Hamano
2022-02-16diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec)Ævar Arnfjörð Bjarmason
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren
2021-08-25advice: remove read uses of most global `advice_` variablesBen Boeckel
2021-05-19Merge branch 'en/dir-traversal'Junio C Hamano
2021-05-12dir: introduce readdir_skip_dot_and_dotdot() helperElijah Newren
2021-05-11Merge branch 'js/merge-already-up-to-date-message-reword'Junio C Hamano
2021-05-03merge(s): apply consistent punctuation to "up to date" messagesEric Sunshine
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson
2021-03-14use CALLOC_ARRAYRené Scharfe
2019-04-01notes-merge: switch to use the_hash_algobrian m. carlson
2019-01-14notes-utils.c: remove the_repository referencesNguyễn Thái Ngọc Duy
2018-11-12notes-merge.c: remove implicit dependency the_repositoryNguyễn Thái Ngọc Duy
2018-11-12notes-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-10-19Merge branch 'nd/the-index'Junio C Hamano
2018-09-21sha1-file.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-17Merge branch 'jk/cocci'Junio C Hamano
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King
2018-07-20commit.h: remove method declarationsDerrick Stolee
2018-06-29commit: add repository argument to lookup_commit_referenceStefan Beller
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano
2018-05-30Merge branch 'js/use-bug-macro'Junio C Hamano
2018-05-23Merge branch 'ds/lazy-load-trees'Junio C Hamano
2018-05-16object-store: move object access functions to object-store.hStefan Beller
2018-05-06Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin
2018-04-11treewide: replace maybe_tree with accessor methodsDerrick Stolee
2018-04-11treewide: rename tree to maybe_treeDerrick Stolee
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson
2018-01-30commit: convert commit_tree* to object_idPatryk Obara
generated by cgit v0.10.2-6-g49f6 at 2024-04-25 02:08:57 (GMT)