summaryrefslogtreecommitdiffstats
path: root/merge-recursive.c (follow)
Commit message (Expand)AuthorAgeLines
* Merge branch 'jt/no-abuse-alternate-odb-for-submodules'Junio C Hamano2021-10-25-21/+20
|\
| * merge-{ort,recursive}: remove add_submodule_odb()Jonathan Tan2021-10-08-21/+20
| * Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-f...Junio C Hamano2021-09-22-17/+32
| |\
* | \ Merge branch 'en/removing-untracked-fixes'Junio C Hamano2021-10-13-1/+4
|\ \ \
| * | | unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren2021-09-27-7/+1
| * | | read-tree, merge-recursive: overwrite ignored files by defaultElijah Newren2021-09-27-1/+10
* | | | Merge branch 'jt/add-submodule-odb-clean-up'Junio C Hamano2021-10-06-17/+32
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | revision: remove "submodule" from opt structJonathan Tan2021-09-09-17/+32
* | | Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano2021-09-20-0/+3
|\ \ \ | |_|/ |/| |
| * | merge: make sparse-aware with ORTDerrick Stolee2021-09-09-0/+3
| |/
* / merge-recursive: use fspathcmp() in path_hashmap_cmp()René Scharfe2021-08-30-4/+1
|/
* use fspathhash() everywhereRené Scharfe2021-07-30-8/+3
* Merge branch 'en/rename-limits-doc'Junio C Hamano2021-07-28-1/+1
|\
| * rename: bump limit defaults yet againElijah Newren2021-07-15-1/+1
* | Merge branch 'ab/attribute-format'Junio C Hamano2021-07-28-0/+1
|\ \
| * | *.c static functions: add missing __attribute__((format))Ævar Arnfjörð Bjarmason2021-07-13-0/+1
| |/
* | Merge branch 'ab/struct-init'Junio C Hamano2021-07-16-2/+2
|\ \
| * | string-list.h users: change to use *_{nodup,dup}()Ævar Arnfjörð Bjarmason2021-07-01-2/+2
* | | Merge branch 'en/merge-dir-rename-corner-case-fix'Junio C Hamano2021-07-16-6/+13
|\ \ \ | |_|/ |/| |
| * | merge-recursive: handle rename-to-self caseElijah Newren2021-06-30-6/+13
| |/
* / *: fix typos which duplicate a wordAndrei Rybak2021-06-14-1/+1
|/
* Merge branch 'js/merge-already-up-to-date-message-reword'Junio C Hamano2021-05-11-1/+1
|\
| * merge(s): apply consistent punctuation to "up to date" messagesEric Sunshine2021-05-03-1/+1
* | Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano2021-05-10-5/+5
|\ \
| * | hash: provide per-algorithm null OIDsbrian m. carlson2021-04-27-5/+5
* | | Merge branch 'ds/sparse-index-protections'Junio C Hamano2021-04-30-1/+3
|\ \ \
| * | | merge-recursive: ensure full indexDerrick Stolee2021-04-14-0/+2
| * | | *: remove 'const' qualifier for struct index_stateDerrick Stolee2021-04-14-1/+1
* | | | Merge branch 'en/ort-readiness'Junio C Hamano2021-04-16-0/+37
|\ \ \ \ | |_|/ / |/| | |
| * | | merge-recursive: add a bunch of FIXME comments documenting known bugsElijah Newren2021-03-20-0/+37
* | | | Merge branch 'ab/read-tree'Junio C Hamano2021-03-30-3/+3
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | tree.h API: simplify read_tree_recursive() signatureÆvar Arnfjörð Bjarmason2021-03-20-3/+3
| |/
* / use CALLOC_ARRAYRené Scharfe2021-03-13-5/+4
|/
* commit: move reverse_commit_list() from merge-recursiveElijah Newren2020-12-16-11/+0
* hashmap: provide deallocation function namesElijah Newren2020-11-02-3/+3
* Merge branch 'en/eol-attrs-gotchas'Junio C Hamano2020-08-10-0/+3
|\
| * merge: make merge.renormalize work for all uses of merge machineryElijah Newren2020-08-03-0/+3
* | merge-recursive: fix unclear and outright wrong commentsElijah Newren2020-08-02-2/+3
|/
* merge-recursive: fix rename/rename(1to2) for working tree with a binaryElijah Newren2020-05-14-0/+12
* convert: permit passing additional metadata to filter processesbrian m. carlson2020-03-16-1/+1
* Merge branch 'en/merge-path-collision'Junio C Hamano2020-03-09-105/+47
|\
| * merge-recursive: apply collision handling unification to recursive caseElijah Newren2020-02-27-105/+47
* | Merge branch 'en/t3433-rebase-stat-dirty-failure'Junio C Hamano2020-03-02-2/+5
|\ \ | |/ |/|
| * merge-recursive: fix the refresh logic in update_file_flagsElijah Newren2020-02-19-2/+5
* | merge-recursive: use subtraction to flip stageJunio C Hamano2020-01-27-3/+2
* | merge-recursive: silence -Wxor-used-as-pow warningJeff King2020-01-27-5/+14
|/
* Merge branch 'en/merge-recursive-oid-eq-simplify'Junio C Hamano2020-01-06-22/+11
|\
| * merge-recursive: remove unnecessary oid_eq functionElijah Newren2020-01-02-22/+11
* | Merge branch 'en/merge-recursive-directory-rename-fixes'Junio C Hamano2019-11-10-23/+81
|\ \ | |/ |/|
| * merge-recursive: fix merging a subdirectory into the root directoryElijah Newren2019-10-23-3/+49
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 23:46:45 +0000