git, branch v2.26.1

Git 2.26.1

2020-03-25T20:07:47Z

Signed-off-by: Junio C Hamano

Git 2.26

2020-03-22T23:50:46Z

Signed-off-by: Junio C Hamano

Merge branch 'en/rebase-backend'

2020-03-21T20:48:54Z

Test fix. * en/rebase-backend: t3419: prevent failure when run with EXPENSIVE

Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git

2020-03-21T19:12:28Z

l10n-2.26.0-rnd2.1 * tag 'l10n-2.26.0-rnd2.1' of https://github.com/git-l10n/git-po: (28 commits) l10n: tr.po: change file mode to 644 l10n: de.po: Update German translation for Git 2.26.0 l10n: de.po: add missing space l10n: tr: Fix a couple of ambiguities l10n: Update Catalan translation l10n: sv.po: Update Swedish translation (4839t0f0u) l10n: zh_CN: Revise v2.26.0 translation l10n: zh_CN: for git v2.26.0 l10n round 1 and 2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0 l10n: vi: fix translation + grammar l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated) l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated) l10n: it.po: update the Italian translation for Git 2.26.0 round 2 l10n: es: 2.26.0 round#2 l10n: bg.po: Updated Bulgarian translation (4839t) l10n: tr: v2.26.0 round 2 l10n: fr : v2.26.0 rnd 2 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed) l10n: tr: Add glossary for Turkish translations l10n: sv.po: Update Swedish translation (4835t0f0u) ...

l10n: tr.po: change file mode to 644

2020-03-21T10:26:56Z

Signed-off-by: Jiang Xin

t3419: prevent failure when run with EXPENSIVE

2020-03-20T22:25:24Z

This test runs a function which itself runs several assertions. The last of these assertions cleans up the .git/rebase-apply directory, since when run with EXPENSIVE set, the function is invoked a second time to run the same tests with a larger data set. However, as of 2ac0d6273f ("rebase: change the default backend from "am" to "merge"", 2020-02-15), the default backend of rebase has changed, and cleaning up the rebase-apply directory has no effect: it no longer exists, since we're using rebase-merge instead. Since we don't really care which rebase backend is in use, let's just use the command "git rebase --quit", which will do the right thing regardless. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

l10n: de.po: Update German translation for Git 2.26.0

2020-03-20T11:19:22Z

Signed-off-by: Matthias Rüster Reviewed-by: Ralf Thielow Reviewed-by: Phillip Szelat

l10n: de.po: add missing space

2020-03-20T09:45:37Z

Signed-off-by: Ralf Thielow

Merge https://github.com/prati0100/git-gui

2020-03-19T23:06:51Z

* 'master' of https://github.com/prati0100/git-gui: git-gui: create a new namespace for chord script evaluation git-gui: reduce Tcl version requirement from 8.6 to 8.5 git-gui--askpass: coerce answers to UTF-8 on Windows git-gui: fix error popup when doing blame -> "Show History Context" git-gui: add missing close bracket git-gui: update German translation git-gui: extend translation glossary template with more terms git-gui: update pot template and German translation to current source code

l10n: tr: Fix a couple of ambiguities

2020-03-19T22:36:24Z

Signed-off-by: Emir Sarı