* 'fr_review' of git://github.com/jnavila/git:
  l10n: fr.po: Review French translation

* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4581t)

Signed-off-by: NCédric Malard <c.malard-git@valdun.net>
Signed-off-by: NJean-Noel Avila <jn.avila@free.fr>

Reviewed-by: NRalf Thielow <ralf.thielow@gmail.com>
Signed-off-by: NMatthias Rüster <matthias.ruester@gmail.com>

Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

Acked-by: NRalf Thielow <ralf.thielow@gmail.com>
Signed-off-by: NMatthias Rüster <matthias.ruester@gmail.com>

Signed-off-by: NAlexander Shopov <ash@kambanaria.org>

Revise 51 translations, improving consistency for some phrased.
Update email address for Fangyi Zhou
Signed-off-by: NFangyi Zhou <me@fangyi.io>
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

Translate 274 new messages (4581t0f0u) for git 2.22.0.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

* '2.22' of https://github.com/ChrisADR/git-po:
  l10n: es: 2.22.0 round 3

* 'it-l10n-wip' of github.com:AlessandroMenti/git-po:
  l10n: it.po: Updated Italian translation

Signed-off-by: NChristopher Diaz Riveros <chrisadr@gentoo.org>

Signed-off-by: NAlessandro Menti <alessandro.menti@alessandromenti.it>

Signed-off-by: NJean-Noël Avila <jn.avila@free.fr>

Signed-off-by: NTran Ngoc Quan <vnwildman@gmail.com>

Generate po/git.pot from v2.22.0-rc3 for git v2.22.0 l10n round 3.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

* 'master' of git://git.kernel.org/pub/scm/git/git:
  Git 2.22-rc3
  i18n: fix typos found during l10n for git 2.22.0
  RelNotes: minor typo fixes in 2.22.0 draft
  list-objects-filter: disable 'sparse:path' filters

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Disable "--filter=sparse:path=<path>" that would allow reading from
paths on the filesystem.

* cc/list-objects-filter-wo-sparse-path:
  list-objects-filter: disable 'sparse:path' filters

Fix two typos introduced by the following commits:

+ 31fba9d3 (diff-parseopt: convert --[src|dst]-prefix, 2019-03-24)
+ ed8b4132 (remote-curl: mark all error messages for translation,
  2019-03-05)
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
Acked-by: NJohannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NTodd Zullinger <tmz@pobox.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NChristopher Diaz Riveros <chrisadr@gentoo.org>

* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po(4580t): Updated Vietnamese translation for v2.22.0 round 2

* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4580t)

Signed-off-by: NAlexander Shopov <ash@kambanaria.org>

Signed-off-by: NTran Ngoc Quan <vnwildman@gmail.com>

Signed-off-by: NJean-Noël Avila <jn.avila@free.fr>

Generate po/git.pot from v2.22.0-rc2 for git v2.22.0 l10n round 2.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

* 'master' of git://git.kernel.org/pub/scm/git/git: (66 commits)
  Git 2.22-rc2
  ...

* 'master' of https://github.com/Softcatala/git-po:
  l10n: Update Catalan translation

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* js/rebase-config-bitfix:
  rebase: replace incorrect logical negation by correct bitwise one

Doc markup fix.

* es/doc-gitsubmodules-markup:
  gitsubmodules: align html and nroff lists

Typofix.

* ja/diff-opt-typofix:
  diff: fix mistake in translatable strings

A brown-paper-bag bugfix to a change already in 'master'.

* jt/clone-server-option:
  fetch-pack: send server options after command

A brown-paper-bag bugfix to a change already in 'master'.

* sg/progress-off-by-one-fix:
  progress: avoid empty line when breaking the progress line

A bit more leftover clean-up to deprepcate "rebase -p".

* js/rebase-deprecate-preserve-merges:
  rebase docs: recommend `-r` over `-p`
  docs: say that `--rebase=preserve` is deprecated
  tests: mark a couple more test cases as requiring `rebase -p`

Rename environment variables that are used to control the "trace2"
mechanism to a more readable name.

* sg/trace2-rename:
  trace2: document the supported values of GIT_TRACE2* env variables
  trace2: rename environment variables to GIT_TRACE2*

* jh/trace2:
  trace2: fix tracing when NO_PTHREADS is defined

A brown-paper-bag bugfix to a change already in 'master'.

* nd/diff-parseopt:
  parse-options: check empty value in OPT_INTEGER and OPT_ABBREV
  diff-parseopt: restore -U (no argument) behavior
  diff-parseopt: correct variable types that are used by parseopt