diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-06-07 09:36:32 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-06-07 09:36:32 -0700 |
commit | 6ee1eaca3e996e69691f515742129645f453e0e8 (patch) | |
tree | d6990f1a127fcc168e8f68f9c2e9c364304b0de1 /builtin/merge-index.c | |
parent | Merge branch 'en/merge-directory-renames-fix' (diff) | |
parent | Merge branch 'fr_review' of git://github.com/jnavila/git (diff) | |
download | tgif-6ee1eaca3e996e69691f515742129645f453e0e8.tar.xz |
Merge tag 'l10n-2.22.0-rnd3' of git://github.com/git-l10n/git-po
l10n-2.22.0-rnd3
* tag 'l10n-2.22.0-rnd3' of git://github.com/git-l10n/git-po: (25 commits)
l10n: fr.po: Review French translation
l10n: de.po: Update German translation
l10n: de.po: improve description of 'git reset --quiet'
l10n: TEAMS: Change German translation team leader
l10n: bg.po: Updated Bulgarian translation (4581t)
l10n: zh_CN: Revision for git v2.22.0 l10n
l10n: zh_CN: for git v2.22.0 l10n round 1~3
l10n: es: 2.22.0 round 3
l10n: it.po: Updated Italian translation
l10n: fr v2.22.0 rnd 3
l10n: vi.po(4581t): Updated Vietnamese translation for v2.22.0 round 3
l10n: git.pot: v2.22.0 round 3 (3 new, 2 removed)
l10n: es: 2.22.0 round 2
l10n: bg.po: Updated Bulgarian translation (4580t)
l10n: vi.po(4580t): Updated Vietnamese translation for v2.22.0 round 2
l10n: fr.po v2.22.0 round 2
l10n: git.pot: v2.22.0 round 2 (6 new, 3 removed)
l10n: bg.po: Updated Bulgarian translation (4577t)
l10n: es: 2.22.0 round 1
l10n: vi.po(4577t): Updated Vietnamese translation for v2.22.0 round 1
...
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions