summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2022-03-16Merge branch 'ab/object-file-api-updates'Libravatar Junio C Hamano1-1/+1
2022-02-25object-file API: have write_object_file() take "enum object_type"Libravatar Ævar Arnfjörð Bjarmason1-1/+1
2022-02-02merge-ort: format messages slightly different for use in headersLibravatar Elijah Newren1-0/+4
2022-02-02ll-merge: make callers responsible for showing warningsLibravatar Elijah Newren1-1/+4
2021-10-25Merge branch 'jt/no-abuse-alternate-odb-for-submodules'Libravatar Junio C Hamano1-21/+20
2021-10-13Merge branch 'en/removing-untracked-fixes'Libravatar Junio C Hamano1-1/+4
2021-10-08merge-{ort,recursive}: remove add_submodule_odb()Libravatar Jonathan Tan1-21/+20
2021-10-06Merge branch 'jt/add-submodule-odb-clean-up'Libravatar Junio C Hamano1-17/+32
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsLibravatar Elijah Newren1-7/+1
2021-09-27read-tree, merge-recursive: overwrite ignored files by defaultLibravatar Elijah Newren1-1/+10
2021-09-22Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-f...Libravatar Junio C Hamano1-17/+32
2021-09-20Merge branch 'ds/mergies-with-sparse-index'Libravatar Junio C Hamano1-0/+3
2021-09-09merge: make sparse-aware with ORTLibravatar Derrick Stolee1-0/+3
2021-09-09revision: remove "submodule" from opt structLibravatar Jonathan Tan1-17/+32
2021-08-30merge-recursive: use fspathcmp() in path_hashmap_cmp()Libravatar René Scharfe1-4/+1
2021-07-30use fspathhash() everywhereLibravatar René Scharfe1-8/+3
2021-07-28Merge branch 'en/rename-limits-doc'Libravatar Junio C Hamano1-1/+1
2021-07-28Merge branch 'ab/attribute-format'Libravatar Junio C Hamano1-0/+1
2021-07-16Merge branch 'ab/struct-init'Libravatar Junio C Hamano1-2/+2
2021-07-16Merge branch 'en/merge-dir-rename-corner-case-fix'Libravatar Junio C Hamano1-6/+13
2021-07-15rename: bump limit defaults yet againLibravatar Elijah Newren1-1/+1
2021-07-13*.c static functions: add missing __attribute__((format))Libravatar Ævar Arnfjörð Bjarmason1-0/+1
2021-07-01string-list.h users: change to use *_{nodup,dup}()Libravatar Ævar Arnfjörð Bjarmason1-2/+2
2021-06-30merge-recursive: handle rename-to-self caseLibravatar Elijah Newren1-6/+13
2021-06-14*: fix typos which duplicate a wordLibravatar Andrei Rybak1-1/+1
2021-05-11Merge branch 'js/merge-already-up-to-date-message-reword'Libravatar Junio C Hamano1-1/+1
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Libravatar Junio C Hamano1-5/+5
2021-05-03merge(s): apply consistent punctuation to "up to date" messagesLibravatar Eric Sunshine1-1/+1
2021-04-30Merge branch 'ds/sparse-index-protections'Libravatar Junio C Hamano1-1/+3
2021-04-27hash: provide per-algorithm null OIDsLibravatar brian m. carlson1-5/+5
2021-04-16Merge branch 'en/ort-readiness'Libravatar Junio C Hamano1-0/+37
2021-04-14merge-recursive: ensure full indexLibravatar Derrick Stolee1-0/+2
2021-04-14*: remove 'const' qualifier for struct index_stateLibravatar Derrick Stolee1-1/+1
2021-03-30Merge branch 'ab/read-tree'Libravatar Junio C Hamano1-3/+3
2021-03-20tree.h API: simplify read_tree_recursive() signatureLibravatar Ævar Arnfjörð Bjarmason1-3/+3
2021-03-20merge-recursive: add a bunch of FIXME comments documenting known bugsLibravatar Elijah Newren1-0/+37
2021-03-13use CALLOC_ARRAYLibravatar René Scharfe1-5/+4
2020-12-16commit: move reverse_commit_list() from merge-recursiveLibravatar Elijah Newren1-11/+0
2020-11-02hashmap: provide deallocation function namesLibravatar Elijah Newren1-3/+3
2020-08-10Merge branch 'en/eol-attrs-gotchas'Libravatar Junio C Hamano1-0/+3
2020-08-03merge: make merge.renormalize work for all uses of merge machineryLibravatar Elijah Newren1-0/+3
2020-08-02merge-recursive: fix unclear and outright wrong commentsLibravatar Elijah Newren1-2/+3
2020-05-14merge-recursive: fix rename/rename(1to2) for working tree with a binaryLibravatar Elijah Newren1-0/+12
2020-03-16convert: permit passing additional metadata to filter processesLibravatar brian m. carlson1-1/+1
2020-03-09Merge branch 'en/merge-path-collision'Libravatar Junio C Hamano1-105/+47
2020-03-02Merge branch 'en/t3433-rebase-stat-dirty-failure'Libravatar Junio C Hamano1-2/+5
2020-02-27merge-recursive: apply collision handling unification to recursive caseLibravatar Elijah Newren1-105/+47
2020-02-19merge-recursive: fix the refresh logic in update_file_flagsLibravatar Elijah Newren1-2/+5
2020-01-27merge-recursive: use subtraction to flip stageLibravatar Junio C Hamano1-3/+2
2020-01-27merge-recursive: silence -Wxor-used-as-pow warningLibravatar Jeff King1-5/+14
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 20:58:00 +0000