summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 2.17v2.17.0Junio C Hamano2018-04-021-1/+1
* Merge tag 'l10n-2.17.0-rnd1' of git://github.com/git-l10n/git-poJunio C Hamano2018-04-0210-22585/+26683
|\
| * l10n: de.po: translate 132 new messagesRalf Thielow2018-03-311-2093/+2527
| * l10n: zh_CN: review for git v2.17.0 l10n round 1Ray Chen2018-03-291-5/+5
| * l10n: zh_CN: for git v2.17.0 l10n round 1Jiang Xin2018-03-291-2066/+2495
| * l10n: ko.po: Update Korean translationChangwoo Ryu2018-03-281-2074/+2509
| * Merge branch 'fr_v2.17.0' of git://github.com/jnavila/gitJiang Xin2018-03-251-2/+2
| |\
| | * l10n: fr.po: v2.17.0 no fuzzyJean-Noël Avila2018-03-231-2/+2
| * | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2018-03-211-2070/+2501
| |\ \
| | * | l10n: sv.po: Update Swedish translation (3376t0f0u)Peter Krefting2018-03-181-2070/+2501
| * | | Merge branch 'master' of https://github.com/Softcatala/git-poJiang Xin2018-03-211-3652/+3897
| |\ \ \ | | |/ / | |/| |
| | * | l10n: Update Catalan translationJordi Mas2018-03-181-3652/+3897
| * | | Merge branch 'fr_v2.17.0' of git://github.com/jnavila/gitJiang Xin2018-03-181-2090/+2496
| |\ \ \ | | | |/ | | |/|
| | * | l10n: fr.po v2.17.0 round 1Jean-Noël Avila2018-03-171-2090/+2496
| * | | Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2018-03-171-2078/+2513
| |\ \ \
| | * | | l10n: vi.po(3376t): Updated Vietnamese translation for v2.17Tran Ngoc Quan2018-03-171-2078/+2513
| | |/ /
| * | | Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin2018-03-171-2082/+2516
| |\ \ \
| | * | | l10n: bg.po: Updated Bulgarian translation (3376t)Alexander Shopov2018-03-161-2082/+2516
| | |/ /
| * | | l10n: es.po: Update Spanish translation 2.17.0Christopher Diaz Riveros2018-03-151-2247/+2692
| |/ /
| * | Merge remote-tracking branch 'git-po/maint'Jiang Xin2018-03-161-147/+147
| |\ \
| | * \ Merge branch 'merge' of https://github.com/ChrisADR/git-po into maintJiang Xin2018-02-211-147/+147
| | |\ \
| | | * | l10n: es.po: fixes to Spanish translationChristopher Diaz Riveros2018-02-161-147/+147
| * | | | l10n: git.pot: v2.17.0 round 1 (132 new, 44 removed)Jiang Xin2018-03-161-1996/+2400
* | | | | Merge branch 'pw/add-p-single'Junio C Hamano2018-04-021-1/+1
|\ \ \ \ \
| * | | | | add -p: fix 2.17.0-rc* regression due to moved codepw/add-p-singleÆvar Arnfjörð Bjarmason2018-03-311-1/+1
* | | | | | Merge branch 'jh/partial-clone'Junio C Hamano2018-03-293-5/+6
|\ \ \ \ \ \
| * | | | | | upload-pack: disable object filtering when disabled by configjh/partial-cloneJonathan Nieder2018-03-292-5/+5
| * | | | | | unpack-trees: release oid_array after use in check_updates()René Scharfe2018-03-251-0/+1
* | | | | | | Git 2.17-rc2v2.17.0-rc2Junio C Hamano2018-03-281-1/+1
* | | | | | | Merge branch 'tg/stash-doc-typofix'Junio C Hamano2018-03-281-1/+1
|\ \ \ \ \ \ \
| * | | | | | | git-stash.txt: remove extra square brackettg/stash-doc-typofixThomas Gummerer2018-03-271-1/+1
* | | | | | | | Merge branch 'pc/submodule-helper'Junio C Hamano2018-03-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule deinit: handle non existing pathspecs gracefullypc/submodule-helperStefan Beller2018-03-271-1/+1
* | | | | | | | | Merge branch 'nd/parseopt-completion'Junio C Hamano2018-03-282-0/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t9902: disable test on the list of merge-strategies under GETTEXT_POISONnd/parseopt-completionJunio C Hamano2018-03-231-1/+1
| * | | | | | | | | completion: clear cached --options when sourcing the completion scriptSZEDER Gábor2018-03-222-0/+35
* | | | | | | | | | Sync with Git 2.16.3Junio C Hamano2018-03-221-0/+49
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Git 2.16.3v2.16.3snapJunio C Hamano2018-03-223-2/+51
| * | | | | | | | | Merge branch 'ms/non-ascii-ticks' into maintJunio C Hamano2018-03-221-7/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/cached-commit-buffer' into maintJunio C Hamano2018-03-225-46/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sm/mv-dry-run-update' into maintJunio C Hamano2018-03-222-2/+7
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tg/worktree-create-tracking' into maintJunio C Hamano2018-03-221-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gs/test-unset-xdg-cache-home' into maintJunio C Hamano2018-03-221-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/status-doc-fix' into maintJunio C Hamano2018-03-221-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rd/typofix' into maintJunio C Hamano2018-03-225-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bp/fsmonitor' into maintJunio C Hamano2018-03-221-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/doc-interpret-trailers-grammofix' into maintJunio C Hamano2018-03-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/doc-test-must-fail-args' into maintJunio C Hamano2018-03-222-2/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/sparse-updates' into maintJunio C Hamano2018-03-222-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/gettext-poison' into maintJunio C Hamano2018-03-222-8/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \