summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2021-03-22Merge branch 'ds/commit-graph-generation-config'Libravatar Junio C Hamano7-19/+30
2021-03-22Merge branch 'ab/remote-write-config-in-camel-case'Libravatar Junio C Hamano3-2/+6
2021-03-22Merge branch 'mt/cleanly-die-upon-missing-required-filter'Libravatar Junio C Hamano2-1/+24
2021-03-22Merge branch 'jk/open-dotgitx-with-nofollow'Libravatar Junio C Hamano10-41/+197
2021-03-22diff --no-index tests: test mode normalizationLibravatar Ævar Arnfjörð Bjarmason1-0/+55
2021-03-22pack-bitmap: avoid traversal of objects referenced by uninteresting tagLibravatar Patrick Steinhardt2-0/+15
2021-03-22remote-curl: fall back to basic auth if Negotiate failsLibravatar Christopher Schenk1-7/+8
2021-03-22t0052: add simple-ipc tests and t/helper/test-simple-ipc toolLibravatar Jeff Hostetler5-0/+912
2021-03-22simple-ipc: add Unix domain socket implementationLibravatar Jeff Hostetler4-1/+1015
2021-03-22diff --no-index tests: add test for --exit-codeLibravatar Ævar Arnfjörð Bjarmason1-0/+5
2021-03-21transport: also free remote_refs in transport_disconnect()Libravatar Andrzej Hunt3-6/+8
2021-03-21parse-options: don't leak alias help messagesLibravatar Andrzej Hunt2-1/+19
2021-03-21parse-options: convert bitfield values to use binary shiftLibravatar Andrzej Hunt1-17/+17
2021-03-20tree.h API: simplify read_tree_recursive() signatureLibravatar Ævar Arnfjörð Bjarmason8-45/+39
2021-03-20tree.h API: expose read_tree_1() as read_tree_at()Libravatar Ævar Arnfjörð Bjarmason2-8/+15
2021-03-20archive: stop passing "stage" through read_tree_recursive()Libravatar Ævar Arnfjörð Bjarmason1-9/+7
2021-03-20ls-files: refactor away read_tree()Libravatar Ævar Arnfjörð Bjarmason1-43/+34
2021-03-20ls-files: don't needlessly pass around stage variableLibravatar Ævar Arnfjörð Bjarmason1-17/+8
2021-03-20tree.c API: move read_tree() into builtin/ls-files.cLibravatar Ævar Arnfjörð Bjarmason4-95/+92
2021-03-20ls-files tests: add meaningful --with-tree testsLibravatar Ævar Arnfjörð Bjarmason1-0/+41
2021-03-20show tests: add test for "git show <tree>"Libravatar Ævar Arnfjörð Bjarmason1-0/+39
2021-03-20Add testing with merge-ort merge strategyLibravatar Elijah Newren2-0/+3
2021-03-20t6423: mark remaining expected failure under merge-ort as suchLibravatar Elijah Newren1-1/+1
2021-03-20Revert "merge-ort: ignore the directory rename split conflict for now"Libravatar Elijah Newren1-12/+1
2021-03-20merge-recursive: add a bunch of FIXME comments documenting known bugsLibravatar Elijah Newren1-0/+37
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictLibravatar Elijah Newren6-0/+20
2021-03-20t: mark several submodule merging tests as fixed under merge-ortLibravatar Elijah Newren5-9/+22
2021-03-20merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entriesLibravatar Elijah Newren2-15/+32
2021-03-20t6428: new test for SKIP_WORKTREE handling and conflictsLibravatar Elijah Newren1-0/+158
2021-03-20merge-ort: support subtree shiftingLibravatar Elijah Newren1-0/+24
2021-03-20merge-ort: let renormalization change modify/delete into clean deleteLibravatar Elijah Newren1-2/+62
2021-03-20merge-ort: have ll_merge() use a special attr_index for renormalizationLibravatar Elijah Newren1-2/+62
2021-03-20merge-ort: add a special minimal index just for renormalizationLibravatar Elijah Newren1-0/+20
2021-03-20merge-ort: use STABLE_QSORT instead of QSORT where requiredLibravatar Elijah Newren1-1/+7
2021-03-19Merge branch 'tb/git-mv-icase-fix'Libravatar Junio C Hamano1-1/+1
2021-03-19The first batch in 2.32 cycleLibravatar Junio C Hamano3-2/+53
2021-03-19Merge branch 'rs/xcalloc-takes-nelem-first'Libravatar Junio C Hamano4-6/+17
2021-03-19Merge branch 'ah/make-fuzz-all-doc-update'Libravatar Junio C Hamano1-3/+3
2021-03-19Merge branch 'jk/slimmed-down'Libravatar Junio C Hamano5-102/+0
2021-03-19Merge branch 'rs/calloc-array'Libravatar Junio C Hamano89-189/+191
2021-03-19Merge branch 'rs/avoid-null-statement-after-macro-call'Libravatar Junio C Hamano2-2/+2
2021-03-19Merge branch 'km/config-doc-typofix'Libravatar Junio C Hamano1-1/+1
2021-03-19Merge branch 'jt/clone-unborn-head'Libravatar Junio C Hamano1-1/+1
2021-03-19Merge branch 'js/fsmonitor-unpack-fix'Libravatar Junio C Hamano2-2/+3
2021-03-19Merge branch 'jk/bisect-peel-tag-fix'Libravatar Junio C Hamano2-1/+20
2021-03-19Merge branch 'jh/fsmonitor-prework'Libravatar Junio C Hamano1-3/+3
2021-03-19Merge branch 'jc/calloc-fix'Libravatar Junio C Hamano2-6/+4
2021-03-19builtin/pack-objects.c: ignore missing links with --stdin-packsLibravatar Taylor Blau2-0/+39
2021-03-19INSTALL: note on using Asciidoctor to build docLibravatar Bagas Sanjaya1-1/+3
2021-03-18diffcore-rename: determine which relevant_sources are no longer relevantLibravatar Elijah Newren1-1/+50