summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-12-14Merge branch 'da/vs-build-iconv-fix'Libravatar Junio C Hamano3-3/+2
2020-12-14Merge branch 'jk/multi-line-indent-style-fix'Libravatar Junio C Hamano2-2/+2
2020-12-14Merge branch 'jk/check-config-parsing-error-in-upload-pack'Libravatar Junio C Hamano2-1/+10
2020-12-14Merge branch 'ae/doc-reproducible-html'Libravatar Junio C Hamano1-1/+4
2020-12-14Merge branch 'so/glossary-branch-is-not-necessarily-active'Libravatar Junio C Hamano1-1/+1
2020-12-14Merge branch 'fc/atmark-in-refspec'Libravatar Junio C Hamano3-51/+62
2020-12-14Merge branch 'dd/help-autocorrect-never'Libravatar Junio C Hamano3-18/+52
2020-12-14diffcore-rename: accelerate rename_dst setupLibravatar Elijah Newren1-83/+65
2020-12-14diffcore-rename: simplify and accelerate register_rename_src()Libravatar Elijah Newren1-26/+13
2020-12-14t4058: explore duplicate tree entry handling in a bit more detailLibravatar Elijah Newren1-0/+67
2020-12-14t4058: add more tests and documentation for duplicate tree entry handlingLibravatar Elijah Newren1-2/+45
2020-12-14diffcore-rename: reduce jumpiness in progress countersLibravatar Elijah Newren1-2/+3
2020-12-14diffcore-rename: simplify limit checkLibravatar Elijah Newren1-6/+9
2020-12-14diffcore-rename: avoid usage of global in too_many_rename_candidates()Libravatar Elijah Newren1-12/+12
2020-12-14diffcore-rename: rename num_create to num_destinationsLibravatar Elijah Newren1-12/+13
2020-12-14pull: give the advice for choosing rebase/merge much laterLibravatar Felipe Contreras1-14/+18
2020-12-14pull: refactor fast-forward checkLibravatar Felipe Contreras1-11/+15
2020-12-14merge-ort: add basic outline for process_renames()Libravatar Elijah Newren1-1/+97
2020-12-14merge-ort: implement compare_pairs() and collect_renames()Libravatar Elijah Newren1-2/+33
2020-12-14merge-ort: implement detect_regular_renames()Libravatar Elijah Newren1-1/+31
2020-12-14merge-ort: add initial outline for basic rename detectionLibravatar Elijah Newren1-8/+60
2020-12-14merge-ort: add basic data structures for handling renamesLibravatar Elijah Newren1-0/+24
2020-12-14index-format.txt: document v2 format of file system monitor extensionLibravatar Jeff Hostetler1-2/+8
2020-12-14docs: multi-pack-index: remove note about future 'verify' workLibravatar Johannes Berg1-4/+0
2020-12-13init: provide useful advice about init.defaultBranchLibravatar Johannes Schindelin4-4/+29
2020-12-13get_default_branch_name(): prepare for showing some adviceLibravatar Johannes Schindelin5-11/+14
2020-12-13branch -m: allow renaming a yet-unborn branchLibravatar Johannes Schindelin2-1/+11
2020-12-13init: document `init.defaultBranch` betterLibravatar Johannes Schindelin1-4/+7
2020-12-13merge-ort: add modify/delete handling and delayed output processingLibravatar Elijah Newren1-2/+98
2020-12-13merge-ort: add die-not-implemented stub handle_content_merge() functionLibravatar Elijah Newren1-0/+14
2020-12-13merge-ort: add function grouping commentsLibravatar Elijah Newren1-0/+21
2020-12-13merge-ort: add a paths_to_free field to merge_options_internalLibravatar Elijah Newren1-1/+25
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 14:45:15 +0000