summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-12-18Merge branch 'st/selected-text-colors'Libravatar Pratyush Yadav1-2/+4
2020-12-18git-gui: Fix selected text colorsLibravatar Serg Tereshchenko1-2/+4
2020-12-18Merge branch 'rj/clean-speedup'Libravatar Pratyush Yadav1-0/+2
2020-12-18Makefile: conditionally include GIT-VERSION-FILELibravatar Ramsay Jones1-0/+2
2020-12-18Merge branch 'sh/macos-labels'Libravatar Pratyush Yadav1-2/+2
2020-12-18git-gui: fix colored label backgrounds when using themed widgetsLibravatar Stefan Haller1-2/+2
2020-12-16config.mak.uname: remove old NonStop compatibility settingsLibravatar Randall S. Becker1-4/+0
2020-12-16merge-ort: implement merge_incore_recursive()Libravatar Elijah Newren2-2/+98
2020-12-16merge-ort: make clear_internal_opts() aware of partial clearingLibravatar Elijah Newren1-6/+7
2020-12-16merge-ort: copy a few small helper functions from merge-recursive.cLibravatar Elijah Newren1-0/+20
2020-12-16commit: move reverse_commit_list() from merge-recursiveLibravatar Elijah Newren3-11/+14
2020-12-16pack-redundant: fix crash when one packfile in repoLibravatar Jiang Xin2-4/+39
2020-12-16tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereqLibravatar Johannes Schindelin1-8/+0
2020-12-16t9902: use `main` as initial branch nameLibravatar Johannes Schindelin1-154/+155
2020-12-16t6302: use `main` as initial branch nameLibravatar Johannes Schindelin1-29/+30
2020-12-16t5703: use `main` as initial branch nameLibravatar Johannes Schindelin1-32/+33
2020-12-16t5510: use `main` as initial branch nameLibravatar Johannes Schindelin1-83/+85
2020-12-16t5505: finalize transitioning to using the branch name `main`Libravatar Johannes Schindelin1-78/+78
2020-12-16t3205: finalize transitioning to using the branch name `main`Libravatar Johannes Schindelin1-4/+5
2020-12-16t3203: complete the transition to using the branch name `main`Libravatar Johannes Schindelin1-21/+22
2020-12-16t3201: finalize transitioning to using the branch name `main`Libravatar Johannes Schindelin1-41/+42
2020-12-16t3200: finish transitioning to the initial branch name `main`Libravatar Johannes Schindelin1-132/+133
2020-12-16t1400: use `main` as initial branch nameLibravatar Johannes Schindelin1-37/+38
2020-12-16diff: correct interaction between --exit-code and -I<pattern>Libravatar Junio C Hamano2-1/+26
2020-12-17Merge branch 'fr_next' of github.com:jnavila/git into git-po-masterLibravatar Jiang Xin1-2400/+2413
2020-12-17Merge branch '2.30-rc1' of github.com:bitigchi/git-poLibravatar Jiang Xin1-2410/+2506
2020-12-16l10n: fr.po: v2.30.0 rnd 1Libravatar Jean-Noël Avila1-2396/+2409
2020-12-16l10n: fr.po Fix a typoLibravatar Baptiste Fontaine1-1/+1
2020-12-16l10n: fr fix misleading messageLibravatar Jean-Noël Avila1-4/+4
2020-12-16t/perf: fix test_export() failure with BSD `sed`Libravatar Eric Sunshine1-2/+7
2020-12-16l10n: tr: v2.30.0-r1Libravatar Emir Sarı1-2410/+2506
2020-12-15pull: display default warning only when non-ffLibravatar Felipe Contreras2-7/+66
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-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-17 02:54:26 +0000