summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ci/install-depends: attempt to fix "brew cask" stuffJunio C Hamano2021-01-151-4/+4
* Git 2.30v2.30.0Junio C Hamano2020-12-282-12/+9
* Merge branch 'pb/doc-git-linkit-fix'Junio C Hamano2020-12-281-2/+2
|\
| * git.txt: fix typos in 'linkgit' macro invocationPhilippe Blain2020-12-221-2/+2
* | Merge tag 'l10n-2.30.0-rnd2' of https://github.com/git-l10n/git-poJunio C Hamano2020-12-2812-26547/+53354
|\ \
| * | l10n: zh_CN: for git v2.30.0 l10n round 1 and 2Jiang Xin2020-12-271-2475/+2588
| * | Merge branch 'l10n/zh_TW/201223' of github.com:l10n-tw/git-poJiang Xin2020-12-251-2744/+2602
| |\ \
| | * | l10n: zh_TW.po: v2.30.0 round 2 (1 untranslated)pan934122020-12-251-2744/+2602
| * | | l10n: pl.po: add translation and set team leaderArusekk2020-12-232-8992/+22386
| * | | l10n: pl.po: started Polish translationm4sk1n2020-12-231-0/+12579
| |/ /
| * | l10n: de.po: Update German translation for Git 2.30.0Matthias Rüster2020-12-231-2600/+2729
| * | Merge branch 'master' of github.com:Softcatala/git-poJiang Xin2020-12-231-1082/+755
| |\ \
| | * | l10n: Update Catalan translationJordi Mas2020-12-221-1082/+755
| * | | l10n: bg.po: Updated Bulgarian translation (5037t)Alexander Shopov2020-12-221-2480/+2600
| * | | Merge branch 'fr_2.30_rnd2' of github.com:jnavila/gitJiang Xin2020-12-221-382/+419
| |\ \ \
| | * | | l10n: fr.po v2.30.0 rnd 2Jean-Noël Avila2020-12-211-382/+419
| | |/ /
| * / / l10n: tr: v2.30.0-r2Emir Sarı2020-12-211-374/+392
| |/ /
| * | l10n: sv.po: Update Swedish translation (5037t0f0u)Peter Krefting2020-12-211-371/+393
| * | l10n: vi.po(5037t): v2.30.0 rnd 2Tran Ngoc Quan2020-12-211-2621/+2783
| * | l10n: git.pot: v2.30.0 round 2 (1 new, 2 removed)Jiang Xin2020-12-211-370/+376
| * | Merge remote-tracking branch 'github/master' into git-po-masterJiang Xin2020-12-2143-1794/+2162
| |\ \
| * | | l10n: Update Catalan translationJordi Mas2020-12-191-2704/+2992
| * | | Merge branch 'fr_next' of github.com:jnavila/git into git-po-masterJiang Xin2020-12-171-2400/+2413
| |\ \ \
| | * | | l10n: fr.po: v2.30.0 rnd 1Jean-Noël Avila2020-12-161-2396/+2409
| | * | | l10n: fr.po Fix a typoBaptiste Fontaine2020-12-161-1/+1
| | * | | l10n: fr fix misleading messageJean-Noël Avila2020-12-161-4/+4
| * | | | Merge branch '2.30-rc1' of github.com:bitigchi/git-poJiang Xin2020-12-171-2410/+2506
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | l10n: tr: v2.30.0-r1Emir Sarı2020-12-161-2410/+2506
| * | | | l10n: sv.po: Update Swedish translation (5038t0f0u)Peter Krefting2020-12-151-2332/+2532
| |/ / /
| * | | l10n: git.pot: v2.30.0 round 1 (70 new, 45 removed)Jiang Xin2020-12-151-2276/+2375
* | | | Git 2.30-rc2v2.30.0-rc2Junio C Hamano2020-12-232-1/+6
* | | | Merge branch 'nk/refspecs-negative-fix'Junio C Hamano2020-12-232-3/+64
|\ \ \ \
| * | | | negative-refspec: improve comment on query_matches_negative_refspecNipunn Koorapati2020-12-221-0/+6
| * | | | negative-refspec: fix segfault on : refspecNipunn Koorapati2020-12-222-3/+58
* | | | | Merge branch 'ma/maintenance-crontab-fix'Junio C Hamano2020-12-233-5/+20
|\ \ \ \ \
| * | | | | t7900-maintenance: test for magic markersMartin Ågren2020-12-211-0/+9
| * | | | | gc: fix handling of crontab magic markersMartin Ågren2020-12-212-4/+10
| * | | | | git-maintenance.txt: add missing wordMartin Ågren2020-12-211-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'dl/checkout-p-merge-base'Junio C Hamano2020-12-232-2/+9
|\ \ \ \ \
| * | | | | checkout -p: handle tree arguments correctly againJohannes Schindelin2020-12-212-2/+9
* | | | | | Merge branch 'js/no-more-prepare-for-main-in-test'Junio C Hamano2020-12-2311-619/+621
|\ \ \ \ \ \
| * | | | | | tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereqJohannes Schindelin2020-12-171-8/+0
| * | | | | | t9902: use `main` as initial branch nameJohannes Schindelin2020-12-171-154/+155
| * | | | | | t6302: use `main` as initial branch nameJohannes Schindelin2020-12-171-29/+30
| * | | | | | t5703: use `main` as initial branch nameJohannes Schindelin2020-12-171-32/+33
| * | | | | | t5510: use `main` as initial branch nameJohannes Schindelin2020-12-171-83/+85
| * | | | | | t5505: finalize transitioning to using the branch name `main`Johannes Schindelin2020-12-171-78/+78
| * | | | | | t3205: finalize transitioning to using the branch name `main`Johannes Schindelin2020-12-171-4/+5
| * | | | | | t3203: complete the transition to using the branch name `main`Johannes Schindelin2020-12-171-21/+22
| * | | | | | t3201: finalize transitioning to using the branch name `main`Johannes Schindelin2020-12-171-41/+42