summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* l10n: de.po: translate 22 new messagesRalf Thielow2016-03-171-37/+136
| | | | | | | | | Translate 22 new messages came from git.pot update in f1522b2 (l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)) and a5a4168 (l10n: git.pot: Add one new message for Git 2.8.0). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
* Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/gitJiang Xin2016-03-161-5/+7
|\ | | | | | | | | * 'fr_v2.8.0_r3' of git://github.com/jnavila/git: l10n: fr.po v2.8.0 round 3
| * l10n: fr.po v2.8.0 round 3Jean-Noel Avila2016-03-151-5/+7
| | | | | | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
* | Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-koJiang Xin2016-03-161-3/+7
|\ \ | | | | | | | | | | | | * 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko: l10n: ko.po: Update Korean translation
| * | l10n: ko.po: Update Korean translationChangwoo Ryu2016-03-161-3/+7
| |/ | | | | | | Signed-off-by: Changwoo Ryu <cwryu@debian.org>
* | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2016-03-161-31/+122
|\ \ | | | | | | | | | | | | * 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (2530t0f0u)
| * | l10n: sv.po: Update Swedish translation (2530t0f0u)Peter Krefting2016-03-151-31/+122
| |/ | | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
* / l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-03-151-2/+6
|/ | | | Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
* l10n: zh_CN: for git v2.8.0 l10n round 3Jiang Xin2016-03-151-2/+6
| | | | | | Update 1 new translations (2530t0f0u) for git v2.8.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* l10n: git.pot: Add one new message for Git 2.8.0Jiang Xin2016-03-151-1/+5
| | | | | | | | Add one new message came from this commit: * df22724 wt-status: allow "ahead " to be picked up by l10n Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2016-03-159-11003/+12822
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.8.0 l10n round 2 l10n: fr.po v2.8.0 round 2 l10n: ru.po: update Russian translation l10n: ko: Update Korean translation l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed) l10n: zh_CN: for git v2.8.0 l10n round 1 l10n: de.po: translate 48 new messages l10n: de.po: translate "command" as "Befehl" l10n: de.po: fix interactive rebase message l10n: de.po: add space to abbreviation "z. B." l10n: de.po: fix typo l10n: TEAMS: update Ralf Thielow's email address l10n: sv.po: Update Swedish translation (2509t0f0u) l10n: sv.po: Fix inconsistent translation of "progress meter" l10n: ko.po: Update Korean translation l10n: ru.po: update Russian translation l10n: vi.po (2509t): Updated Vietnamese translation l10n: fr.po v2.8.0 round 1 2509t l10n: fr.po: Correct case in sentence l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)
| * l10n: zh_CN: for git v2.8.0 l10n round 2Jiang Xin2016-03-151-20/+121
| | | | | | | | | | | | Update 21 new translations (2529t0f0u) for git v2.8.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * l10n: fr.po v2.8.0 round 2Jean-Noel Avila2016-03-141-31/+134
| | | | | | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
| * Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2016-03-131-24/+121
| |\ | | | | | | | | | | | | * 'russian-l10n' of https://github.com/DJm00n/git-po-ru: l10n: ru.po: update Russian translation
| | * l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-03-131-24/+121
| | | | | | | | | | | | Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
| * | l10n: ko: Update Korean translationChangwoo Ryu2016-03-121-17/+118
| |/ | | | | | | Signed-off-by: Changwoo Ryu <cwryu@debian.org>
| * l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)Jiang Xin2016-03-121-14/+111
| | | | | | | | | | | | Generate po/git.pot from v2.8.0-rc2 for git v2.8.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2016-03-129-10936/+12256
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.8.0 l10n round 1 l10n: de.po: translate 48 new messages l10n: de.po: translate "command" as "Befehl" l10n: de.po: fix interactive rebase message l10n: de.po: add space to abbreviation "z. B." l10n: de.po: fix typo l10n: TEAMS: update Ralf Thielow's email address l10n: sv.po: Update Swedish translation (2509t0f0u) l10n: sv.po: Fix inconsistent translation of "progress meter" l10n: ko.po: Update Korean translation l10n: ru.po: update Russian translation l10n: vi.po (2509t): Updated Vietnamese translation l10n: fr.po v2.8.0 round 1 2509t l10n: fr.po: Correct case in sentence l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)
| | * l10n: zh_CN: for git v2.8.0 l10n round 1Jiang Xin2016-03-121-1353/+1527
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update 48 new translations (2509t0f0u) for git v2.8.0-rc0. Reviewed-by: Ray Chen <oldsharp@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> l10n: zh_CN: review for git v2.8.0 l10n round 1
| | * l10n: de.po: translate 48 new messagesRalf Thielow2016-03-051-1360/+1545
| | | | | | | | | | | | | | | | | | | | | | | | Translate 48 new messages came from git.pot update in 9eb3984 (l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
| | * l10n: de.po: translate "command" as "Befehl"Ralf Thielow2016-03-051-40/+40
| | | | | | | | | | | | | | | Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com>
| | * l10n: de.po: fix interactive rebase messageRalf Thielow2016-03-051-2/+2
| | | | | | | | | | | | Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
| | * l10n: de.po: add space to abbreviation "z. B."Ralf Thielow2016-03-051-3/+3
| | | | | | | | | | | | | | | Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com>
| | * l10n: de.po: fix typoChristoph Hoopmann2016-03-051-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Christoph Hoopmann <christophhoopmann@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
| | * l10n: TEAMS: update Ralf Thielow's email addressRalf Thielow2016-03-051-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| | * Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2016-03-051-1358/+1537
| | |\ | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (2509t0f0u) l10n: sv.po: Fix inconsistent translation of "progress meter"
| | | * l10n: sv.po: Update Swedish translation (2509t0f0u)Peter Krefting2016-03-041-1355/+1534
| | | | | | | | | | | | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
| | | * l10n: sv.po: Fix inconsistent translation of "progress meter"Peter Krefting2016-03-041-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
| | * | Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-koJiang Xin2016-03-051-1402/+1583
| | |\ \ | | | | | | | | | | | | | | | | | | | | * 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko: l10n: ko.po: Update Korean translation
| | | * | l10n: ko.po: Update Korean translationChangwoo Ryu2016-03-031-1402/+1583
| | | |/ | | | | | | | | | | | | Signed-off-by: Changwoo Ryu <cwryu@debian.org>
| | * / l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-03-021-1380/+1503
| | |/ | | | | | | | | | Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
| | * Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2016-02-291-1356/+1538
| | |\ | | | | | | | | | | | | | | | | * 'master' of https://github.com/vnwildman/git: l10n: vi.po (2509t): Updated Vietnamese translation
| | | * l10n: vi.po (2509t): Updated Vietnamese translationTran Ngoc Quan2016-02-291-1356/+1538
| | | | | | | | | | | | | | | | Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
| | * | l10n: fr.po v2.8.0 round 1 2509tJean-Noel Avila2016-02-281-1361/+1535
| | | | | | | | | | | | | | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
| | * | l10n: fr.po: Correct case in sentenceAudric Schiltknecht2016-02-281-1/+1
| | |/ | | | | | | | | | Signed-off-by: Audric Schiltknecht <storm@chemicalstorm.org>
| | * l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)Jiang Xin2016-02-281-1320/+1442
| | | | | | | | | | | | | | | | | | Generate po/git.pot from v2.8.0-rc0 for git v2.8.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* | | Merge branch 'mg/wt-status-mismarked-i18n'Junio C Hamano2016-03-141-2/+2
|\ \ \ | |/ / |/| | | | | | | | * mg/wt-status-mismarked-i18n: wt-status: allow "ahead " to be picked up by l10n
| * | wt-status: allow "ahead " to be picked up by l10nMichael J Gruber2016-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The extra pair of parentheses keeps the l10n engine from picking up the string. Remove them so that "ahead " ends up in git.pot. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 2.8-rc2v2.8.0-rc2Junio C Hamano2016-03-102-5/+6
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Sync with 2.7.3Junio C Hamano2016-03-102-1/+64
|\ \ \
| * | | Git 2.7.3v2.7.3Junio C Hamano2016-03-104-3/+66
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | Merge branch 'ma/update-hooks-sample-typofix' into maintJunio C Hamano2016-03-101-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ma/update-hooks-sample-typofix: templates/hooks: fix minor typo in the sample update-hook
| * \ \ \ Merge branch 'dt/initial-ref-xn-commit-doc' into maintJunio C Hamano2016-03-101-0/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * dt/initial-ref-xn-commit-doc: refs: document transaction semantics
| * \ \ \ \ Merge branch 'ps/plug-xdl-merge-leak' into maintJunio C Hamano2016-03-101-2/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ps/plug-xdl-merge-leak: xdiff/xmerge: fix memory leak in xdl_merge
| * \ \ \ \ \ Merge branch 'ak/git-strip-extension-from-dashed-command' into maintJunio C Hamano2016-03-102-15/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code simplification. * ak/git-strip-extension-from-dashed-command: git.c: simplify stripping extension of a file in handle_builtin()
| * \ \ \ \ \ \ Merge branch 'ak/extract-argv0-last-dir-sep' into maintJunio C Hamano2016-03-101-4/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code simplification. * ak/extract-argv0-last-dir-sep: exec_cmd.c: use find_last_dir_sep() for code simplification
| * \ \ \ \ \ \ \ Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2016-03-104-0/+207
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code to read the pack data using the offsets stored in the pack idx file has been made more carefully check the validity of the data in the idx. * jk/pack-idx-corruption-safety: sha1_file.c: mark strings for translation use_pack: handle signed off_t overflow nth_packed_object_offset: bounds-check extended offset t5313: test bounds-checks of corrupted/malicious pack/idx files
| * \ \ \ \ \ \ \ \ Merge branch 'js/config-set-in-non-repository' into maintJunio C Hamano2016-03-102-0/+14
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "git config section.var value" to set a value in per-repository configuration file failed when it was run outside any repository, but didn't say the reason correctly. * js/config-set-in-non-repository: git config: report when trying to modify a non-existing repo config
| * \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-module-list-fix' into maintJunio C Hamano2016-03-102-8/+27
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A helper function "git submodule" uses since v2.7.0 to list the modules that match the pathspec argument given to its subcommands (e.g. "submodule add <repo> <path>") has been fixed. * sb/submodule-module-list-fix: submodule helper list: respect correct path prefix
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/grep-binary-workaround-in-test' into maintJunio C Hamano2016-03-102-13/+17
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent versions of GNU grep are pickier when their input contains arbitrary binary data, which some of our tests uses. Rewrite the tests to sidestep the problem. * jk/grep-binary-workaround-in-test: t9200: avoid grep on non-ASCII data t8005: avoid grep on non-ASCII data
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 02:45:58 +0100