summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* patch-ids: handle duplicate hashmap entriesJeff King2021-01-124-4/+48
* Git 2.29.2v2.29.2Junio C Hamano2020-10-293-2/+14
* Merge branch 'cc/doc-filter-branch-typofix' into maintJunio C Hamano2020-10-291-1/+1
|\
| * filter-branch doc: fix filter-repo typoChristian Couder2020-10-201-1/+1
* | Merge branch 'jk/committer-date-is-author-date-fix' into maintJunio C Hamano2020-10-293-5/+5
|\ \
| * | rebase: fix broken email with --committer-date-is-author-dateJeff King2020-10-232-5/+5
| * | am: fix broken email with --committer-date-is-author-dateJeff King2020-10-232-3/+3
| * | t3436: check --committer-date-is-author-date result more carefullyJeff King2020-10-231-7/+7
* | | Git 2.29.1v2.29.1Junio C Hamano2020-10-233-2/+13
* | | Merge branch 'js/no-builtins-on-disk-option' into maintJunio C Hamano2020-10-231-9/+6
|\ \ \
| * | | SKIP_DASHED_BUILT_INS: do not skip the bin/ programsJohannes Schindelin2020-10-211-9/+6
* | | | Git 2.29v2.29.0Junio C Hamano2020-10-191-1/+1
* | | | Merge tag 'l10n-2.29.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2020-10-1813-43679/+58411
|\ \ \ \
| * \ \ \ Merge branch 'master' of github.com:Softcatala/git-poJiang Xin2020-10-181-3572/+4352
| |\ \ \ \
| | * | | | l10n: Update Catalan translationJordi Mas2020-10-061-3572/+4352
| * | | | | l10n: zh_CN: for git v2.29.0 l10n round 1 and 2Jiang Xin2020-10-181-3432/+3788
| * | | | | l10n: de.po: Update German translation for Git 2.29.0Matthias Rüster2020-10-151-3452/+3817
| * | | | | Merge branch 'pt-PT' of github.com:git-l10n-pt-PT/git-poJiang Xin2020-10-142-5139/+14813
| |\ \ \ \ \
| | * | | | | l10n: pt_PT: make on po/pt_PT.poDaniel Santos2020-10-121-5136/+14811
| | * | | | | l10n: Portuguese translation team has changed. Wohoo!Daniel Santos2020-10-121-3/+2
| * | | | | | l10n: vi(5013t): Updated translation for v2.29.0 rd2Tran Ngoc Quan2020-10-131-3432/+3869
| |/ / / / /
| * | | | | Merge branch 'master' of github.com:alshopov/git-poJiang Xin2020-10-121-3579/+4205
| |\ \ \ \ \
| | * | | | | l10n: bg.po: Updated Bulgarian translation (5013t)Alexander Shopov2020-10-111-3579/+4205
| * | | | | | Merge branch 'master' of github.com:nafmo/git-l10n-svJiang Xin2020-10-121-3429/+3843
| |\ \ \ \ \ \
| | * | | | | | l10n: sv.po: Update Swedish translation (5013t0f0u)Peter Krefting2020-10-111-3429/+3843
| | |/ / / / /
| * | | | | | Merge branch 'update-italian-translation' of github.com:AlessandroMenti/git-poJiang Xin2020-10-121-141/+141
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | l10n: it.po: update the Italian translationAlessandro Menti2020-10-111-141/+141
| * | | | | | Merge branch 'l10n/zh_TW/201010' of github.com:l10n-tw/git-poJiang Xin2020-10-111-3425/+3892
| |\ \ \ \ \ \
| | * | | | | | l10n: zh_TW.po: v2.29.0 round 2 (2 untranslated)pan934122020-10-101-3425/+3892
| | |/ / / / /
| * | | | | | Merge branch '2.29-r2' of github.com:bitigchi/git-poJiang Xin2020-10-111-129/+131
| |\ \ \ \ \ \
| | * | | | | | l10n: tr: v2.29.0 round 2Emir Sarı2020-10-101-129/+131
| | |/ / / / /
| * / / / / / l10n: fr: v2.29.0 rnd 2Jean-Noël Avila2020-10-101-142/+174
| |/ / / / /
| * | | | | l10n: git.pot: v2.29.0 round 2 (1 new, 1 removed)Jiang Xin2020-10-101-116/+116
| * | | | | Merge tag 'v2.29.0-rc1' of github.com:git/gitJiang Xin2020-10-1022-89/+159
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fr_2.29.0_rnd_1' of github.com:jnavila/gitJiang Xin2020-10-081-3406/+3842
| |\ \ \ \ \ \
| | * | | | | | l10n: fr: v2.29.0 rnd 1Jean-Noël Avila2020-10-071-3406/+3842
| * | | | | | | l10n: it.po: update the Italian translation for Git 2.29.0 round 1Alessandro Menti2020-10-071-3425/+3873
| |/ / / / / /
| * | / / / / l10n: tr: v2.29.0 round 1Emir Sarı2020-10-061-3997/+4342
| | |/ / / / | |/| | | |
| * | | | | l10n: git.pot: v2.29.0 round 1 (124 new, 42 removed)Jiang Xin2020-10-061-3326/+3676
* | | | | | Merge https://github.com/prati0100/git-guiJunio C Hamano2020-10-173-49/+93
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'sh/blame-tooltip'Pratyush Yadav2020-10-171-0/+1
| |\ \ \ \ \ \
| | * | | | | | git-gui: blame: prevent tool tips from sticking around after Command-TabStefan Haller2020-10-171-0/+1
| |/ / / / / /
| * | | | | | Merge branch 'st/dark-mode' into masterPratyush Yadav2020-10-082-6/+49
| |\ \ \ \ \ \
| | * | | | | | git-gui: improve dark mode supportSerg Tereshchenko2020-10-072-6/+49
| |/ / / / / /
| * | | | | | Merge branch 'st/spaces-tabs-cleanup' into masterPratyush Yadav2020-09-221-43/+43
| |\ \ \ \ \ \
| | * | | | | | git-gui: fix mixed tabs and spaces; prefer tabsSerg Tereshchenko2020-09-221-43/+43
| |/ / / / / /
* | | / / / / Git 2.29-rc2v2.29.0-rc2Junio C Hamano2020-10-151-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Git 2.29-rc1v2.29.0-rc1Junio C Hamano2020-10-092-14/+22
* | | | | | Merge branch 'js/default-branch-name-part-3'Junio C Hamano2020-10-095-25/+25
|\ \ \ \ \ \
| * | | | | | tests: avoid using the branch name `main`Johannes Schindelin2020-10-084-16/+16