summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorLines
2021-03-20tree.h API: simplify read_tree_recursive() signatureÆvar Arnfjörð Bjarmason-45/+39
2021-03-20tree.h API: expose read_tree_1() as read_tree_at()Ævar Arnfjörð Bjarmason-8/+15
2021-03-20archive: stop passing "stage" through read_tree_recursive()Ævar Arnfjörð Bjarmason-9/+7
2021-03-20ls-files: refactor away read_tree()Ævar Arnfjörð Bjarmason-43/+34
2021-03-20ls-files: don't needlessly pass around stage variableÆvar Arnfjörð Bjarmason-17/+8
2021-03-20tree.c API: move read_tree() into builtin/ls-files.cÆvar Arnfjörð Bjarmason-95/+92
2021-03-20ls-files tests: add meaningful --with-tree testsÆvar Arnfjörð Bjarmason-0/+41
2021-03-20show tests: add test for "git show <tree>"Ævar Arnfjörð Bjarmason-0/+39
2021-03-20Add testing with merge-ort merge strategyElijah Newren-0/+3
2021-03-20t6423: mark remaining expected failure under merge-ort as suchElijah Newren-1/+1
2021-03-20Revert "merge-ort: ignore the directory rename split conflict for now"Elijah Newren-12/+1
2021-03-20merge-recursive: add a bunch of FIXME comments documenting known bugsElijah Newren-0/+37
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren-0/+20
2021-03-20t: mark several submodule merging tests as fixed under merge-ortElijah Newren-9/+22
2021-03-20merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entriesElijah Newren-15/+32
2021-03-20t6428: new test for SKIP_WORKTREE handling and conflictsElijah Newren-0/+158
2021-03-20merge-ort: support subtree shiftingElijah Newren-0/+24
2021-03-20merge-ort: let renormalization change modify/delete into clean deleteElijah Newren-2/+62
2021-03-20merge-ort: have ll_merge() use a special attr_index for renormalizationElijah Newren-2/+62
2021-03-20merge-ort: add a special minimal index just for renormalizationElijah Newren-0/+20
2021-03-20merge-ort: use STABLE_QSORT instead of QSORT where requiredElijah Newren-1/+7
2021-03-19Merge branch 'tb/git-mv-icase-fix'Junio C Hamano-1/+1
2021-03-19The first batch in 2.32 cycleJunio C Hamano-2/+53
2021-03-19Merge branch 'rs/xcalloc-takes-nelem-first'Junio C Hamano-6/+17
2021-03-19Merge branch 'ah/make-fuzz-all-doc-update'Junio C Hamano-3/+3
2021-03-19Merge branch 'jk/slimmed-down'Junio C Hamano-102/+0
2021-03-19Merge branch 'rs/calloc-array'Junio C Hamano-189/+191
2021-03-19Merge branch 'rs/avoid-null-statement-after-macro-call'Junio C Hamano-2/+2
2021-03-19Merge branch 'km/config-doc-typofix'Junio C Hamano-1/+1
2021-03-19Merge branch 'jt/clone-unborn-head'Junio C Hamano-1/+1
2021-03-19Merge branch 'js/fsmonitor-unpack-fix'Junio C Hamano-2/+3
2021-03-19Merge branch 'jk/bisect-peel-tag-fix'Junio C Hamano-1/+20
2021-03-19Merge branch 'jh/fsmonitor-prework'Junio C Hamano-3/+3
2021-03-19Merge branch 'jc/calloc-fix'Junio C Hamano-6/+4
2021-03-19builtin/pack-objects.c: ignore missing links with --stdin-packsTaylor Blau-0/+39
2021-03-19INSTALL: note on using Asciidoctor to build docBagas Sanjaya-1/+3
2021-03-18diffcore-rename: determine which relevant_sources are no longer relevantElijah Newren-1/+50
2021-03-18merge-ort: record the reason that we want a rename for a fileElijah Newren-5/+16
2021-03-18diffcore-rename: add computation of number of unknown renamesElijah Newren-4/+40
2021-03-18diffcore-rename: check if we have enough renames for directories early onElijah Newren-10/+63
2021-03-18diffcore-rename: only compute dir_rename_count for relevant directoriesElijah Newren-5/+22
2021-03-18merge-ort: record the reason that we want a rename for a directoryElijah Newren-4/+46
2021-03-18merge-ort, diffcore-rename: tweak dirs_removed and relevant_source typeElijah Newren-40/+41
2021-03-18diffcore-rename: take advantage of "majority rules" to skip more renamesElijah Newren-0/+25
2021-03-18t: annotate !PTHREADS tests with !FAIL_PREREQSJeff King-3/+6
2021-03-18convert: add classification for conv_attrs structJeff Hostetler-7/+52
2021-03-18convert: add get_stream_filter_ca() variantJeff Hostetler-11/+19
2021-03-18convert: add [async_]convert_to_working_tree_ca() variantsJeff Hostetler-37/+60
2021-03-18convert: make convert_attrs() and convert structs publicJeff Hostetler-27/+32
2021-03-18fsmonitor: add perf test for git diff HEADNipunn Koorapati-2/+6