summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-12-16t5703: use `main` as initial branch nameJohannes Schindelin1-32/+33
2020-12-16t5510: use `main` as initial branch nameJohannes Schindelin1-83/+85
2020-12-16t5505: finalize transitioning to using the branch name `main`Johannes Schindelin1-78/+78
2020-12-16t3205: finalize transitioning to using the branch name `main`Johannes Schindelin1-4/+5
2020-12-16t3203: complete the transition to using the branch name `main`Johannes Schindelin1-21/+22
2020-12-16t3201: finalize transitioning to using the branch name `main`Johannes Schindelin1-41/+42
2020-12-16t3200: finish transitioning to the initial branch name `main`Johannes Schindelin1-132/+133
2020-12-16t1400: use `main` as initial branch nameJohannes Schindelin1-37/+38
2020-12-16diff: correct interaction between --exit-code and -I<pattern>Junio C Hamano2-1/+26
2020-12-17Merge branch 'fr_next' of github.com:jnavila/git into git-po-masterJiang Xin1-2400/+2413
2020-12-17Merge branch '2.30-rc1' of github.com:bitigchi/git-poJiang Xin1-2410/+2506
2020-12-16l10n: fr.po: v2.30.0 rnd 1Jean-Noël Avila1-2396/+2409
2020-12-16l10n: fr.po Fix a typoBaptiste Fontaine1-1/+1
2020-12-16l10n: fr fix misleading messageJean-Noël Avila1-4/+4
2020-12-16t/perf: fix test_export() failure with BSD `sed`Eric Sunshine1-2/+7
2020-12-16l10n: tr: v2.30.0-r1Emir Sarı1-2410/+2506
2020-12-15pull: display default warning only when non-ffFelipe Contreras2-7/+66
2020-12-15pull: correct condition to trigger non-ff adviceJunio C Hamano1-13/+19
2020-12-15pull: get rid of unnecessary global variableJunio C Hamano1-6/+5
2020-12-15merge-ort: add implementation of type-changed rename handlingElijah Newren1-3/+32
2020-12-15merge-ort: add implementation of normal rename handlingElijah Newren1-1/+5
2020-12-15merge-ort: add implementation of rename collisionsElijah Newren1-3/+51
2020-12-15merge-ort: add implementation of rename/delete conflictsElijah Newren1-8/+40
2020-12-15merge-ort: add implementation of both sides renaming differentlyElijah Newren1-3/+55
2020-12-15merge-ort: add implementation of both sides renaming identicallyElijah Newren1-2/+18
2020-12-15style: do not "break" in switch() after "return"Ævar Arnfjörð Bjarmason2-3/+0
2020-12-15compat-util: pretend that stub setitimer() always succeedsJunio C Hamano1-1/+1
2020-12-15strmap: make callers of strmap_remove() to call it in void contextJunio C Hamano1-2/+2
2020-12-15pack-redundant: gauge the usage before proposing its removalJunio C Hamano2-13/+28
2020-12-15l10n: sv.po: Update Swedish translation (5038t0f0u)Peter Krefting1-2332/+2532
2020-12-15l10n: git.pot: v2.30.0 round 1 (70 new, 45 removed)Jiang Xin1-2276/+2375
2020-12-14doc: mention Python 3.x supportsĐoàn Trần Công Danh2-3/+2
2020-12-14Git 2.30-rc0v2.30.0-rc0Junio C Hamano2-1/+29
2020-12-14Merge branch 'js/t5526-with-no-particular-primary-branch-name'Junio C Hamano1-40/+43
2020-12-14Merge branch 'js/cmake-extra-built-ins-fix'Junio C Hamano1-4/+11
2020-12-14Merge branch 'da/vs-build-iconv-fix'Junio C Hamano3-3/+2
2020-12-14Merge branch 'jk/multi-line-indent-style-fix'Junio C Hamano2-2/+2
2020-12-14Merge branch 'jk/check-config-parsing-error-in-upload-pack'Junio C Hamano2-1/+10
2020-12-14Merge branch 'ae/doc-reproducible-html'Junio C Hamano1-1/+4
2020-12-14Merge branch 'so/glossary-branch-is-not-necessarily-active'Junio C Hamano1-1/+1
2020-12-14Merge branch 'fc/atmark-in-refspec'Junio C Hamano3-51/+62
2020-12-14Merge branch 'dd/help-autocorrect-never'Junio C Hamano3-18/+52
2020-12-14diffcore-rename: accelerate rename_dst setupElijah Newren1-83/+65
2020-12-14diffcore-rename: simplify and accelerate register_rename_src()Elijah Newren1-26/+13
2020-12-14t4058: explore duplicate tree entry handling in a bit more detailElijah Newren1-0/+67
2020-12-14t4058: add more tests and documentation for duplicate tree entry handlingElijah Newren1-2/+45
2020-12-14diffcore-rename: reduce jumpiness in progress countersElijah Newren1-2/+3
2020-12-14diffcore-rename: simplify limit checkElijah Newren1-6/+9
2020-12-14diffcore-rename: avoid usage of global in too_many_rename_candidates()Elijah Newren1-12/+12
2020-12-14diffcore-rename: rename num_create to num_destinationsElijah Newren1-12/+13