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