summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-12-21revision: move diff merges functions to its own diff-merges.cSergey Organov6-78/+97
2020-12-21revision: provide implementation for diff merges tweaksSergey Organov3-11/+24
2020-12-21revision: factor out initialization of diff-merge related settingsSergey Organov1-1/+8
2020-12-21revision: factor out setup of diff-merge related settingsSergey Organov1-6/+12
2020-12-21revision: factor out parsing of diff-merge related optionsSergey Organov1-27/+40
2020-12-21worktree: teach `repair` to fix multi-directional breakageEric Sunshine4-1/+73
2020-12-21test: bisect-porcelain: fix location of filesFelipe Contreras1-8/+8
2020-12-21l10n: fr.po v2.30.0 rnd 2Jean-Noël Avila1-382/+419
2020-12-21l10n: tr: v2.30.0-r2Emir Sarı1-374/+392
2020-12-21l10n: sv.po: Update Swedish translation (5037t0f0u)Peter Krefting1-371/+393
2020-12-21l10n: vi.po(5037t): v2.30.0 rnd 2Tran Ngoc Quan1-2621/+2783
2020-12-21l10n: git.pot: v2.30.0 round 2 (1 new, 2 removed)Jiang Xin1-370/+376
2020-12-21Merge remote-tracking branch 'github/master' into git-po-masterJiang Xin43-1794/+2162
2020-12-19l10n: Update Catalan translationJordi Mas1-2704/+2992
2020-12-18Git 2.30-rc1v2.30.0-rc1Junio C Hamano2-1/+5
2020-12-18Merge branch 'jc/diff-I-status-fix'Junio C Hamano2-1/+26
2020-12-18Merge branch 'es/perf-export-fix'Junio C Hamano1-2/+7
2020-12-18Merge branch 'rb/nonstop-config-mak-uname-update'Junio C Hamano1-4/+0
2020-12-18Merge branch 'ab/unreachable-break'Junio C Hamano2-3/+0
2020-12-18Merge branch 'jc/strmap-remove-typefix'Junio C Hamano1-2/+2
2020-12-18Merge branch 'jc/compat-util-setitimer-fix'Junio C Hamano1-1/+1
2020-12-18Merge branch 'dd/doc-p4-requirements-update'Junio C Hamano2-3/+2
2020-12-18Merge branch 'js/init-defaultbranch-advice'Junio C Hamano10-20/+61
2020-12-18Merge https://github.com/prati0100/git-guiJunio C Hamano6-1397/+1711
2020-12-19Merge branch 'sh/inactive-background'Pratyush Yadav2-16/+37
2020-12-19git-gui: use gray background for inactive text widgetsStefan Haller2-16/+37
2020-12-17Another batch before 2.30-rc1Junio C Hamano1-0/+2
2020-12-17Merge branch 'jh/index-v2-doc-on-fsmn'Junio C Hamano1-2/+8
2020-12-17Merge branch 'jb/midx-doc-update'Junio C Hamano1-4/+0
2020-12-17Merge branch 'rj/make-clean'Junio C Hamano3-8/+15
2020-12-17Merge branch 'js/t7064-master-to-initial'Junio C Hamano1-51/+52
2020-12-17Merge branch 'js/t6300-hardcode-main'Junio C Hamano1-88/+90
2020-12-17Merge branch 'jk/oid-array-cleanup'Junio C Hamano6-199/+157
2020-12-17Merge branch 'tb/partial-clone-filters-fix'Junio C Hamano3-6/+21
2020-12-17Merge branch 'js/t7900-protect-pwd-in-config-get'Junio C Hamano1-2/+2
2020-12-18Merge branch 'st/selected-text-colors'Pratyush Yadav1-2/+4
2020-12-18git-gui: Fix selected text colorsSerg Tereshchenko1-2/+4
2020-12-18Merge branch 'rj/clean-speedup'Pratyush Yadav1-0/+2
2020-12-18Makefile: conditionally include GIT-VERSION-FILERamsay Jones1-0/+2
2020-12-18Merge branch 'sh/macos-labels'Pratyush Yadav1-2/+2
2020-12-18git-gui: fix colored label backgrounds when using themed widgetsStefan Haller1-2/+2
2020-12-16config.mak.uname: remove old NonStop compatibility settingsRandall S. Becker1-4/+0
2020-12-16merge-ort: implement merge_incore_recursive()Elijah Newren2-2/+98
2020-12-16merge-ort: make clear_internal_opts() aware of partial clearingElijah Newren1-6/+7
2020-12-16merge-ort: copy a few small helper functions from merge-recursive.cElijah Newren1-0/+20
2020-12-16commit: move reverse_commit_list() from merge-recursiveElijah Newren3-11/+14
2020-12-16pack-redundant: fix crash when one packfile in repoJiang Xin2-4/+39
2020-12-16tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereqJohannes Schindelin1-8/+0
2020-12-16t9902: use `main` as initial branch nameJohannes Schindelin1-154/+155
2020-12-16t6302: use `main` as initial branch nameJohannes Schindelin1-29/+30