summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2020-03-20l10n: tr: Fix a couple of ambiguitiesLibravatar Emir Sarı1-9/+9
Signed-off-by: Emir Sarı <bitigchi@me.com>
2020-03-18l10n: Update Catalan translationLibravatar Jordi Mas1-80/+71
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2020-03-17l10n: sv.po: Update Swedish translation (4839t0f0u)Libravatar Peter Krefting1-266/+296
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2020-03-17l10n: zh_CN: Revise v2.26.0 translationLibravatar Fangyi Zhou1-26/+26
Signed-off-by: Fangyi Zhou <me@fangyi.io> Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2020-03-17l10n: zh_CN: for git v2.26.0 l10n round 1 and 2Libravatar Jiang Xin1-2541/+2844
Translate 79 new messages (4839t0f0u) for git 2.26.0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2020-03-16l10n: vi(4839t): Updated Vietnamese translation for v2.26.0Libravatar Tran Ngoc Quan1-2557/+2975
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2020-03-16l10n: vi: fix translation + grammarLibravatar Đoàn Trần Công Danh1-14/+14
- context should be translated to ngữ cảnh instead of nội dung - add missing accents - switch adjective and secondary objects position: * The formatted English text will be "To remove '+/-' lines", it should be translated to "Để bỏ dòng bắt đầu với '+/-' Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
2020-03-15l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated)Libravatar Yi-Jyun1-388/+289
Revision 2. Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
2020-03-15l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated)Libravatar Yi-Jyun1-2604/+2823
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
2020-03-12Merge branch of github.com:ChrisADR/git-po into masterLibravatar Jiang Xin1-2550/+2979
* 'next' of github.com:ChrisADR/git-po: l10n: es: 2.26.0 round#2
2020-03-12l10n: it.po: update the Italian translation for Git 2.26.0 round 2Libravatar Alessandro Menti1-267/+297
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
2020-03-11l10n: es: 2.26.0 round#2Libravatar Christopher Diaz Riveros1-2550/+2979
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
2020-03-12Merge branch of github.com:alshopov/git-po into masterLibravatar Jiang Xin1-242/+270
* 'git-l10n_git-po_master' of github.com:alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (4839t)
2020-03-12Merge branch of github.com:bitigchi/git-po into masterLibravatar Jiang Xin1-262/+284
* 'tr_translations_2.26.1' of github.com:bitigchi/git-po: l10n: tr: v2.26.0 round 2
2020-03-12l10n: bg.po: Updated Bulgarian translation (4839t)Libravatar Alexander Shopov1-242/+270
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2020-03-12l10n: tr: v2.26.0 round 2Libravatar Emir Sarı1-262/+284
Signed-off-by: Emir Sarı <bitigchi@me.com>
2020-03-11l10n: fr : v2.26.0 rnd 2Libravatar Jean-Noël Avila1-353/+308
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2020-03-11l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed)Libravatar Jiang Xin1-238/+260
Generate po/git.pot from v2.26.0-rc1 for git v2.26.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2020-03-11Merge branch 'master' of github.com:git/git into git-po-masterLibravatar Jiang Xin37-983/+1439
* 'master' of github.com:git/git: (27 commits) Git 2.26-rc1 remote-curl: show progress for fetches over dumb HTTP show_one_mergetag: print non-parent in hex form. config.mak.dev: re-enable -Wformat-zero-length rebase-interactive.c: silence format-zero-length warnings mingw: workaround for hangs when sending STDIN t6020: new test with interleaved lexicographic ordering of directories t6022, t6046: test expected behavior instead of testing a proxy for it t3035: prefer test_must_fail to bash negation for git commands t6020, t6022, t6035: update merge tests to use test helper functions t602[1236], t6034: modernize test formatting merge-recursive: apply collision handling unification to recursive case completion: add diff --color-moved[-ws] t1050: replace test -f with test_path_is_file am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch am: support --show-current-patch=raw as a synonym for--show-current-patch am: convert "resume" variable to a struct parse-options: convert "command mode" to a flag parse-options: add testcases for OPT_CMDMODE() stash push: support the --pathspec-from-file option ...
2020-03-10l10n: tr: Add glossary for Turkish translationsLibravatar Emir Sarı1-4/+87
Signed-off-by: Emir Sarı <bitigchi@me.com>
2020-03-10Merge branch 'master' of github.com:nafmo/git-l10n-svLibravatar Jiang Xin1-2379/+2764
* 'master' of github.com:nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (4835t0f0u)
2020-03-10Merge branch 'fr_2.26.0' of github.com:jnavila/gitLibravatar Jiang Xin1-2399/+2788
* 'fr_2.26.0' of github.com:jnavila/git: l10n: fr v2.26.0 rnd1
2020-03-09l10n: sv.po: Update Swedish translation (4835t0f0u)Libravatar Peter Krefting1-2379/+2764
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2020-03-09l10n: tr: Add Turkish translationsLibravatar Emir Sarı1-0/+24458
Signed-off-by: Emir Sarı <bitigchi@me.com>
2020-03-09l10n: tr: Add Turkish translation team infoLibravatar Emir Sarı1-0/+4
Signed-off-by: Emir Sarı <bitigchi@me.com>
2020-03-09Git 2.26-rc1Libravatar Junio C Hamano2-1/+28
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-03-09Merge branch 'rs/show-progress-in-dumb-http-fetch'Libravatar Junio C Hamano3-1/+14
"git fetch" over HTTP walker protocol did not show any progress output. We inherently do not know how much work remains, but still we can show something not to bore users. * rs/show-progress-in-dumb-http-fetch: remote-curl: show progress for fetches over dumb HTTP
2020-03-09Merge branch 'hd/show-one-mergetag-fix'Libravatar Junio C Hamano2-1/+21
"git show" and others gave an object name in raw format in its error output, which has been corrected to give it in hex. * hd/show-one-mergetag-fix: show_one_mergetag: print non-parent in hex form.
2020-03-09Merge branch 'rt/format-zero-length-fix'Libravatar Junio C Hamano2-3/+2
Recently we inadvertently added a few instances of using 0-width format string to functions that we mark as printf-like without any developers noticing. The root cause was that the compiler warning that is triggered by this is almost always useless and we disabled the warning in our developer builds, but not for general public. The new instances have been corrected, and the warning has been resurrected in the developer builds. * rt/format-zero-length-fix: config.mak.dev: re-enable -Wformat-zero-length rebase-interactive.c: silence format-zero-length warnings
2020-03-09Merge branch 'am/mingw-poll-fix'Libravatar Junio C Hamano1-28/+3
MinGW's poll() emulation has been improved. * am/mingw-poll-fix: mingw: workaround for hangs when sending STDIN
2020-03-09Merge branch 'en/test-cleanup'Libravatar Junio C Hamano9-677/+752
Test cleanup. * en/test-cleanup: t6020: new test with interleaved lexicographic ordering of directories t6022, t6046: test expected behavior instead of testing a proxy for it t3035: prefer test_must_fail to bash negation for git commands t6020, t6022, t6035: update merge tests to use test helper functions t602[1236], t6034: modernize test formatting
2020-03-09Merge branch 'en/merge-path-collision'Libravatar Junio C Hamano2-114/+77
Handling of conflicting renames in merge-recursive have further been made consistent with how existing codepaths try to mimic what is done to add/add conflicts. * en/merge-path-collision: merge-recursive: apply collision handling unification to recursive case
2020-03-09Merge branch 'kk/complete-diff-color-moved'Libravatar Junio C Hamano1-0/+15
Completion update. * kk/complete-diff-color-moved: completion: add diff --color-moved[-ws]
2020-03-09Merge branch 'rj/t1050-use-test-path-is-file'Libravatar Junio C Hamano1-4/+6
Code cleanup. * rj/t1050-use-test-path-is-file: t1050: replace test -f with test_path_is_file
2020-03-09Merge branch 'pb/am-show-current-patch'Libravatar Junio C Hamano8-39/+140
"git am --short-current-patch" is a way to show the piece of e-mail for the stopped step, which is not suitable to directly feed "git apply" (it is designed to be a good "git am" input). It learned a new option to show only the patch part. * pb/am-show-current-patch: am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch am: support --show-current-patch=raw as a synonym for--show-current-patch am: convert "resume" variable to a struct parse-options: convert "command mode" to a flag parse-options: add testcases for OPT_CMDMODE()
2020-03-09Merge branch 'am/pathspec-f-f-more'Libravatar Junio C Hamano7-115/+381
"git rm" and "git stash" learns the new "--pathspec-from-file" option. * am/pathspec-f-f-more: stash push: support the --pathspec-from-file option stash: eliminate crude option parsing doc: stash: synchronize <pathspec> description doc: stash: document more options doc: stash: split options from description (2) doc: stash: split options from description (1) rm: support the --pathspec-from-file option doc: rm: synchronize <pathspec> description
2020-03-08l10n: fr v2.26.0 rnd1Libravatar Jean-Noël Avila1-2399/+2788
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2020-03-08Merge branch of github.com:alshopov/git-po into masterLibravatar Jiang Xin1-2390/+2692
* 'git-l10n_git-po_master' of github.com:alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (4835t)
2020-03-07l10n: it.po: update the Italian translation for Git 2.26.0 round 1Libravatar Alessandro Menti1-2421/+2828
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
2020-03-06l10n: bg.po: Updated Bulgarian translation (4835t)Libravatar Alexander Shopov1-2390/+2692
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2020-03-06l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed)Libravatar Jiang Xin1-2325/+2553
Generate po/git.pot from v2.26.0-rc0 for git v2.26.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2020-03-06Merge branch 'master' of github.com:git-l10n/git-poLibravatar Jiang Xin1-204/+162
* 'master' of github.com:git-l10n/git-po: l10n: Update Catalan translation l10n: Update Catalan translation
2020-03-05Git 2.26-rc0Libravatar Junio C Hamano2-1/+41
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-03-05t5537: adjust test_oid labelLibravatar Johannes Schindelin1-3/+3
We recently switched to using Perl instead of `sed` in the httpd-based tests. Let's reflect that in the label we give the corresponding commit hashes. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-03-05Merge branch 'hi/gpg-use-check-signature'Libravatar Junio C Hamano4-72/+75
"git merge signed-tag" while lacking the public key started to say "No signature", which was utterly wrong. This regression has been reverted. * hi/gpg-use-check-signature: Revert "gpg-interface: prefer check_signature() for GPG verification"
2020-03-05Merge branch 'rs/commit-graph-code-simplification'Libravatar Junio C Hamano1-6/+2
Code simplfication. * rs/commit-graph-code-simplification: commit-graph: use progress title directly
2020-03-05Merge branch 'js/ci-windows-update'Libravatar Junio C Hamano10-73/+93
Updates to the CI settings. * js/ci-windows-update: Azure Pipeline: switch to the latest agent pools ci: prevent `perforce` from being quarantined t/lib-httpd: avoid using macOS' sed
2020-03-05Merge branch 'be/describe-multiroot'Libravatar Junio C Hamano2-4/+69
"git describe" in a repository with multiple root commits sometimes gave up looking for the best tag to describe a given commit with too early, which has been adjusted. * be/describe-multiroot: describe: don't abort too early when searching tags
2020-03-05Merge branch 'ag/rebase-remove-redundant-code'Libravatar Junio C Hamano1-9/+1
Code reduction. * ag/rebase-remove-redundant-code: builtin/rebase: remove a call to get_oid() on `options.switch_to'
2020-03-05Merge branch 'es/recursive-single-branch-clone'Libravatar Junio C Hamano5-9/+56
"git clone --recurse-submodules --single-branch" now uses the same single-branch option when cloning the submodules. * es/recursive-single-branch-clone: clone: pass --single-branch during --recurse-submodules submodule--helper: use C99 named initializer