summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diff-delta: fix encoding size that would not fit in "unsigned int"mk/diff-delta-uint-may-be-shorter-than-ulongMartin Koegler2017-08-101-11/+13
* Merge tag 'v2.14.1'Junio C Hamano2017-08-0416-3/+135
|\
| * Git 2.14.1v2.14.1Junio C Hamano2017-08-043-2/+6
| * Merge tag 'v2.13.5' into maintJunio C Hamano2017-08-0414-2/+130
| |\
| | * Git 2.13.5v2.13.5Junio C Hamano2017-08-013-2/+6
| | * Merge tag 'v2.12.4' into maintJunio C Hamano2017-08-0113-2/+126
| | |\
| | | * Git 2.12.4v2.12.4Junio C Hamano2017-07-303-2/+6
| | | * Merge tag 'v2.11.3' into maint-2.12Junio C Hamano2017-07-3011-0/+116
| | | |\
| | | | * Git 2.11.3v2.11.3Junio C Hamano2017-07-303-2/+6
| | | | * Merge tag 'v2.10.4' into maint-2.11Junio C Hamano2017-07-3010-0/+112
| | | | |\
| | | | | * Git 2.10.4v2.10.4Junio C Hamano2017-07-303-2/+6
| | | | | * Merge tag 'v2.9.5' into maint-2.10Junio C Hamano2017-07-309-0/+108
| | | | | |\
| | | | | | * Git 2.9.5v2.9.5maint-2.9Junio C Hamano2017-07-303-2/+6
| | | | | | * Merge tag 'v2.8.6' into maint-2.9Junio C Hamano2017-07-308-0/+104
| | | | | | |\
| | | | | | | * Git 2.8.6v2.8.6maint-2.8Junio C Hamano2017-07-303-2/+6
| | | | | | | * Merge tag 'v2.7.6' into maint-2.8Junio C Hamano2017-07-307-0/+100
| | | | | | | |\
| | | | | | | | * Git 2.7.6v2.7.6maint-2.7Junio C Hamano2017-07-303-2/+27
| | | | | | | | * Merge branch 'jk/ssh-funny-url' into maint-2.7Junio C Hamano2017-07-286-0/+75
| | | | | | | | |\
| | | | | | | | | * connect: reject paths that look like command line optionsJeff King2017-07-283-0/+40
| | | | | | | | | * connect: reject dashed arguments for proxy commandsJeff King2017-07-282-0/+10
| | | | | | | | | * connect: factor out "looks like command line option" checkJeff King2017-07-283-1/+14
| | | | | | | | | * t5813: add test for hostname starting with dashJeff King2017-07-281-0/+9
| | | | | | | | | * connect: reject ssh hostname that begins with a dashJunio C Hamano2017-07-281-0/+3
| | | | | | | | |/
| | | * | | | | | Merge branch 'jk/lib-proto-disable-cleanup' into maint-2.12Junio C Hamano2017-07-301-2/+6
| | | |\ \ \ \ \ \
| | | | * | | | | | t/lib-proto-disable: restore protocol.allow after config testsJeff King2017-07-281-2/+6
| | | |/ / / / / /
* | | | | | | | | Start post 2.14 cycleJunio C Hamano2017-08-041-1/+1
|/ / / / / / / /
* | | | | | | | Git 2.14v2.14.0Junio C Hamano2017-08-042-13/+3
* | | | | | | | Merge branch 'ah/patch-id-doc'Junio C Hamano2017-08-041-3/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: remove unsupported parameter from patch-idah/patch-id-docAndreas Heiduk2017-07-281-3/+0
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'as/diff-options-grammofix'Junio C Hamano2017-08-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | diff-options doc: grammar fixas/diff-options-grammofixAnthony Sottile2017-07-311-1/+1
* | | | | | | | | Merge tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2017-08-029-15801/+17022
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | l10n: zh_CN: review for git v2.14.0 l10nJiang Xin2017-08-022-8/+10
| * | | | | | | | | l10n: ko.po: Update Korean translationChangwoo Ryu2017-08-011-13/+56
| * | | | | | | | | l10n: zh_CN: for git v2.14.0 l10n round 2Jiang Xin2017-08-011-3165/+3147
| * | | | | | | | | l10n: de.po: various fixes in German translationHartmut Henkel2017-07-301-27/+25
| * | | | | | | | | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2017-07-301-3027/+3137
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2017-07-301-3027/+3137
| * | | | | | | | | | Merge branch 'master' of https://github.com/ralfth/git-po-deJiang Xin2017-07-271-3010/+3181
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | l10n: de.po: update German translationRalf Thielow2017-07-261-3010/+3181
| * | | | | | | | | | | Merge branch 'fr_l10n_v2.14.0rnd2' of git://github.com/jnavila/gitJiang Xin2017-07-271-3038/+3222
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | l10n: fr.po v2.14.0 rnd 2Jean-Noel Avila2017-07-271-3009/+3193
| | * | | | | | | | | | l10n: fr.po Fix some french typosSylvestre Ledru2017-07-271-17/+17
| | * | | | | | | | | | l10n: fr.po Fix typoLouis2017-07-271-1/+1
| | * | | | | | | | | | l10n: fr.po Fix some translationsHugues Peccatte2017-07-271-13/+13
| * | | | | | | | | | | Merge branch 'master' of https://github.com/Softcatala/git-poJiang Xin2017-07-261-3453/+4119
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | l10n: Update Catalan translationJordi Mas2017-07-241-3453/+4119
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin2017-07-261-17/+67
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | l10n: bg.po: Updated Bulgarian translation (3213t)Alexander Shopov2017-07-241-17/+67
| | |/ / / / / / / / / /
| * | | | | | | | | | | l10n: vi.po (3213t): Updated 9 new stringsTran Ngoc Quan2017-07-251-50/+65
| |/ / / / / / / / / /