git

git:maint

Last commit made on 2020-03-22
Get this branch:
git clone -b maint https://git.launchpad.net/git

Branch merges

Branch information

Name:
maint
Repository:
lp:git

Recent commits

274b9cc... by Junio C Hamano <email address hidden> on 2020-03-22

Git 2.26

Signed-off-by: Junio C Hamano <email address hidden>

55a7568... by Junio C Hamano <email address hidden> on 2020-03-21

Merge branch 'en/rebase-backend'

Test fix.

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

c452dfa... by Junio C Hamano <email address hidden> on 2020-03-21

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

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)
  ...

1557364... by Jiang Xin on 2020-03-21

l10n: tr.po: change file mode to 644

Signed-off-by: Jiang Xin <email address hidden>

2da1b05... by "brian m. carlson" <email address hidden> on 2020-03-20

t3419: prevent failure when run with EXPENSIVE

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 <email address hidden>
Signed-off-by: Junio C Hamano <email address hidden>

1ae3a38... by Matthias Rüster on 2020-03-14

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

Signed-off-by: Matthias Rüster <email address hidden>
Reviewed-by: Ralf Thielow <email address hidden>
Reviewed-by: Phillip Szelat <email address hidden>

5804c6e... by Ralf Thielow on 2020-01-21

l10n: de.po: add missing space

Signed-off-by: Ralf Thielow <email address hidden>

98cedd0... by Junio C Hamano <email address hidden> on 2020-03-19

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

* '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

4914ba4... by Emir Sarı <email address hidden> on 2020-03-19

l10n: tr: Fix a couple of ambiguities

Signed-off-by: Emir Sarı <email address hidden>

a572802... by Pratyush Yadav <email address hidden> on 2020-03-19

Merge branch 'py/remove-tcloo'

Reduce the Tcl version requirement to 8.5 to allow git-gui to run on
MacOS distributions like High Sierra. While here, fix a potential
variable name collision.

* py/remove-tcloo:
  git-gui: create a new namespace for chord script evaluation
  git-gui: reduce Tcl version requirement from 8.6 to 8.5