summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-12-13merge-ort: add a path_conflict field to merge_options_internalLibravatar Elijah Newren1-0/+7
2020-12-13merge-ort: add a clear_internal_opts helperLibravatar Elijah Newren1-16/+24
2020-12-13merge-ort: add a few includesLibravatar Elijah Newren1-0/+2
2020-12-13merge-ort: free data structures in merge_finalize()Libravatar Elijah Newren1-1/+31
2020-12-13merge-ort: add implementation of record_conflicted_index_entries()Libravatar Elijah Newren1-1/+87
2020-12-13tree: enable cmp_cache_name_compare() to be used elsewhereLibravatar Elijah Newren2-1/+3
2020-12-13merge-ort: add implementation of checkout()Libravatar Elijah Newren1-1/+44
2020-12-13merge-ort: basic outline for merge_switch_to_result()Libravatar Elijah Newren1-1/+41
2020-12-13merge-ort: step 3 of tree writing -- handling subdirectories as we goLibravatar Elijah Newren1-8/+234
2020-12-13merge-ort: step 2 of tree writing -- function to create tree objectLibravatar Elijah Newren1-1/+66
2020-12-13merge-ort: step 1 of tree writing -- record basenames, modes, and oidsLibravatar Elijah Newren1-3/+37
2020-12-13merge-ort: have process_entries operate in a defined orderLibravatar Elijah Newren1-3/+50
2020-12-13merge-ort: add a preliminary simple process_entries() implementationLibravatar Elijah Newren1-1/+102
2020-12-13merge-ort: avoid recursing into identical treesLibravatar Elijah Newren1-0/+13
2020-12-13merge-ort: record stage and auxiliary info for every pathLibravatar Elijah Newren1-7/+90
2020-12-13merge-ort: compute a few more useful fields for collect_merge_infoLibravatar Elijah Newren1-0/+36
2020-12-13merge-ort: avoid repeating fill_tree_descriptor() on the same treeLibravatar Elijah Newren1-4/+22
2020-12-13merge-ort: implement a very basic collect_merge_info()Libravatar Elijah Newren1-1/+134
2020-12-13merge-ort: add an err() function similar to one from merge-recursiveLibravatar Elijah Newren2-3/+37
2020-12-13merge-ort: use histogram diffLibravatar Elijah Newren1-0/+4
2020-12-13merge-ort: port merge_start() from merge-recursiveLibravatar Elijah Newren1-1/+44
2020-12-13merge-ort: add some high-level algorithm structureLibravatar Elijah Newren1-1/+67
2020-12-13merge-ort: setup basic internal data structuresLibravatar Elijah Newren1-0/+147
2020-12-12rev-parse: add option for absolute or relative path formattingLibravatar brian m. carlson3-43/+194
2020-12-12abspath: add a function to resolve paths with missing componentsLibravatar brian m. carlson2-18/+48
2020-12-09t7900: use --fixed-value in git-maintenance testsLibravatar Josh Steadmon1-2/+2
2020-12-09pretty format %(trailers): add a "key_value_separator"Libravatar Ævar Arnfjörð Bjarmason5-3/+55
2020-12-09pretty format %(trailers): add a "keyonly"Libravatar Ævar Arnfjörð Bjarmason5-6/+40
2020-12-09pretty-format %(trailers): fix broken standalone "valueonly"Libravatar Ævar Arnfjörð Bjarmason2-1/+30
2020-12-09pretty format %(trailers) doc: avoid repetitionLibravatar Ævar Arnfjörð Bjarmason1-14/+16
2020-12-09submodules: fix of regression on fetching of non-init subsub-repoLibravatar Peter Kaestle2-1/+123
2020-12-08Makefile: don't use a versioned temp distribution directoryLibravatar Ramsay Jones1-7/+8
2020-12-08Makefile: don't try to clean old debian build productLibravatar Ramsay Jones1-1/+1
2020-12-08gitweb/Makefile: conditionally include ../GIT-VERSION-FILELibravatar Ramsay Jones1-0/+2
2020-12-08Documentation/Makefile: conditionally include ../GIT-VERSION-FILELibravatar Ramsay Jones1-0/+2
2020-12-08Documentation/Makefile: conditionally include doc.depLibravatar Ramsay Jones1-0/+2
2020-12-08Eleventh batchLibravatar Junio C Hamano1-0/+45
2020-12-08Merge branch 'fc/zsh-completion'Libravatar Junio C Hamano2-1/+2
2020-12-08Merge branch 'sn/config-doc-typofix'Libravatar Junio C Hamano1-1/+1
2020-12-08Merge branch 'fc/random-cleanup'Libravatar Junio C Hamano4-18/+16
2020-12-08Merge branch 'nm/imap-send-use-default-config'Libravatar Junio C Hamano1-22/+30
2020-12-08Merge branch 'jk/banned'Libravatar Junio C Hamano1-0/+13
2020-12-08Merge branch 'tb/bugreport-no-localtime'Libravatar Junio C Hamano1-1/+2
2020-12-08Merge branch 'rs/maintenance-run-outside-repo'Libravatar Junio C Hamano3-8/+9
2020-12-08Merge branch 'rs/fetch-pack-invalid-lockfile'Libravatar Junio C Hamano1-2/+3
2020-12-08Merge branch 'nk/perf-fsmonitor-cleanup'Libravatar Junio C Hamano1-2/+1
2020-12-08Merge branch 'ma/grep-init-default'Libravatar Junio C Hamano6-100/+36
2020-12-08Merge branch 'js/trace2-session-id'Libravatar Junio C Hamano12-3/+198
2020-12-08Merge branch 'mt/do-not-use-scld-in-working-tree'Libravatar Junio C Hamano5-6/+47
2020-12-08Merge branch 'ds/maintenance-part-3'Libravatar Junio C Hamano2-2/+15
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 23:59:51 +0000