summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-12-15pull: correct condition to trigger non-ff adviceLibravatar Junio C Hamano1-13/+19
2020-12-15pull: get rid of unnecessary global variableLibravatar Junio C Hamano1-6/+5
2020-12-15merge-ort: add implementation of type-changed rename handlingLibravatar Elijah Newren1-3/+32
2020-12-15merge-ort: add implementation of normal rename handlingLibravatar Elijah Newren1-1/+5
2020-12-15merge-ort: add implementation of rename collisionsLibravatar Elijah Newren1-3/+51
2020-12-15merge-ort: add implementation of rename/delete conflictsLibravatar Elijah Newren1-8/+40
2020-12-15merge-ort: add implementation of both sides renaming differentlyLibravatar Elijah Newren1-3/+55
2020-12-15merge-ort: add implementation of both sides renaming identicallyLibravatar Elijah Newren1-2/+18
2020-12-15style: do not "break" in switch() after "return"Libravatar Ævar Arnfjörð Bjarmason2-3/+0
2020-12-15compat-util: pretend that stub setitimer() always succeedsLibravatar Junio C Hamano1-1/+1
2020-12-15strmap: make callers of strmap_remove() to call it in void contextLibravatar Junio C Hamano1-2/+2
2020-12-15pack-redundant: gauge the usage before proposing its removalLibravatar Junio C Hamano2-13/+28
2020-12-15l10n: sv.po: Update Swedish translation (5038t0f0u)Libravatar Peter Krefting1-2332/+2532
2020-12-15l10n: git.pot: v2.30.0 round 1 (70 new, 45 removed)Libravatar Jiang Xin1-2276/+2375
2020-12-14doc: mention Python 3.x supportsLibravatar Đoàn Trần Công Danh2-3/+2
2020-12-14Git 2.30-rc0Libravatar Junio C Hamano2-1/+29
2020-12-14Merge branch 'js/t5526-with-no-particular-primary-branch-name'Libravatar Junio C Hamano1-40/+43
2020-12-14Merge branch 'js/cmake-extra-built-ins-fix'Libravatar Junio C Hamano1-4/+11
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