summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)Author
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
2020-03-02Merge branch 'en/t3433-rebase-stat-dirty-failure'Junio C Hamano
2020-02-27merge-recursive: apply collision handling unification to recursive caseElijah Newren
2020-02-19merge-recursive: fix the refresh logic in update_file_flagsElijah Newren
2020-01-27merge-recursive: use subtraction to flip stageJunio C Hamano
2020-01-27merge-recursive: silence -Wxor-used-as-pow warningJeff King
2020-01-06Merge branch 'en/merge-recursive-oid-eq-simplify'Junio C Hamano
2020-01-02merge-recursive: remove unnecessary oid_eq functionElijah Newren
2019-11-10Merge branch 'en/merge-recursive-directory-rename-fixes'Junio C Hamano
2019-10-23merge-recursive: fix merging a subdirectory into the root directoryElijah Newren
2019-10-23merge-recursive: clean up get_renamed_dir_portion()Elijah Newren
2019-10-15Merge branch 'ew/hashmap'Junio C Hamano
2019-10-15Merge branch 'en/merge-recursive-cleanup'Junio C Hamano
2019-10-08merge-recursive: fix the fix to the diff3 common ancestor labelElijah Newren
2019-10-07hashmap: remove type arg from hashmap_{get,put,remove}_entryEric Wong
2019-10-07OFFSETOF_VAR macro to simplify hashmap iteratorsEric Wong
2019-10-07hashmap: introduce hashmap_free_entriesEric Wong
2019-10-07hashmap: use *_entry APIs for iterationEric Wong
2019-10-07hashmap_cmp_fn takes hashmap_entry paramsEric Wong
2019-10-07hashmap_get{,_from_hash} return "struct hashmap_entry *"Eric Wong
2019-10-07hashmap_put takes "struct hashmap_entry *"Eric Wong