summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)Author
2022-06-07Merge branch 'ab/plug-leak-in-revisions'Junio C Hamano
2022-05-20Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano
2022-04-14revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason
2022-04-14string_list API users: use string_list_init_{no,}dupÆvar Arnfjörð Bjarmason
2022-03-17Merge branch 'ab/object-file-api-updates'Junio C Hamano
2022-02-26object-file API: have write_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason
2022-02-02merge-ort: format messages slightly different for use in headersElijah Newren
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren
2021-10-25Merge branch 'jt/no-abuse-alternate-odb-for-submodules'Junio C Hamano
2021-10-13Merge branch 'en/removing-untracked-fixes'Junio C Hamano
2021-10-08merge-{ort,recursive}: remove add_submodule_odb()Jonathan Tan
2021-10-06Merge branch 'jt/add-submodule-odb-clean-up'Junio C Hamano
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren
2021-09-27read-tree, merge-recursive: overwrite ignored files by defaultElijah Newren
2021-09-23Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-f...Junio C Hamano
2021-09-20Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano
2021-09-09merge: make sparse-aware with ORTDerrick Stolee
2021-09-09revision: remove "submodule" from opt structJonathan Tan
2021-08-30merge-recursive: use fspathcmp() in path_hashmap_cmp()René Scharfe
2021-07-30use fspathhash() everywhereRené Scharfe
2021-07-28Merge branch 'en/rename-limits-doc'Junio C Hamano
2021-07-28Merge branch 'ab/attribute-format'Junio C Hamano
2021-07-17Merge branch 'ab/struct-init'Junio C Hamano
2021-07-17Merge branch 'en/merge-dir-rename-corner-case-fix'Junio C Hamano
2021-07-15rename: bump limit defaults yet againElijah Newren
2021-07-13*.c static functions: add missing __attribute__((format))Ævar Arnfjörð Bjarmason
2021-07-01string-list.h users: change to use *_{nodup,dup}()Ævar Arnfjörð Bjarmason
2021-06-30merge-recursive: handle rename-to-self caseElijah Newren
2021-06-14*: fix typos which duplicate a wordAndrei Rybak
2021-05-11Merge branch 'js/merge-already-up-to-date-message-reword'Junio C Hamano
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano
2021-05-03merge(s): apply consistent punctuation to "up to date" messagesEric Sunshine
2021-04-30Merge branch 'ds/sparse-index-protections'Junio C Hamano
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson
2021-04-16Merge branch 'en/ort-readiness'Junio C Hamano
2021-04-14merge-recursive: ensure full indexDerrick Stolee
2021-04-14*: remove 'const' qualifier for struct index_stateDerrick Stolee
2021-03-30Merge branch 'ab/read-tree'Junio C Hamano
2021-03-20tree.h API: simplify read_tree_recursive() signatureÆvar Arnfjörð Bjarmason
2021-03-20merge-recursive: add a bunch of FIXME comments documenting known bugsElijah Newren
2021-03-14use CALLOC_ARRAYRené Scharfe
2020-12-17commit: move reverse_commit_list() from merge-recursiveElijah Newren
2020-11-02hashmap: provide deallocation function namesElijah Newren
2020-08-10Merge branch 'en/eol-attrs-gotchas'Junio C Hamano
2020-08-03merge: make merge.renormalize work for all uses of merge machineryElijah Newren
2020-08-02merge-recursive: fix unclear and outright wrong commentsElijah Newren
2020-05-14merge-recursive: fix rename/rename(1to2) for working tree with a binaryElijah Newren
2020-03-16convert: permit passing additional metadata to filter processesbrian m. carlson
2020-03-09Merge branch 'en/merge-path-collision'Junio C Hamano
generated by cgit v0.10.2-6-g49f6 at 2024-04-24 02:38:41 (GMT)