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

Docfix.

* ah/patch-id-doc:
  doc: remove unsupported parameter from patch-id

A grammofix.

* as/diff-options-grammofix:
  diff-options doc: grammar fix

l10n for Git 2.14.0 round 2

* tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po:
  l10n: zh_CN: review for git v2.14.0 l10n
  l10n: ko.po: Update Korean translation
  l10n: zh_CN: for git v2.14.0 l10n round 2
  l10n: de.po: various fixes in German translation
  l10n: ru.po: update Russian translation
  l10n: fr.po v2.14.0 rnd 2
  l10n: fr.po Fix some french typos
  l10n: fr.po Fix typo
  l10n: fr.po Fix some translations
  l10n: de.po: update German translation
  l10n: vi.po (3213t): Updated 9 new strings
  l10n: Update Catalan translation
  l10n: bg.po: Updated Bulgarian translation (3213t)

Reviewed-by: N依云 <lilydjwg@gmail.com>
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

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

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

Signed-off-by: NChangwoo Ryu <cwryu@debian.org>

Translate new l10n messages for git 2.14.0, and update translations on
"stash".
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

* maint:
  Preparation for 2.13.4 continues

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

Doc clean-up.

* ks/doc-fixes:
  doc: reformat the paragraph containing the 'cut-line'
  doc: camelCase the i18n config variables to improve readability

A test fix.

* jk/test-copy-bytes-fix:
  t: handle EOF in test_copy_bytes()

Code refactoring.

* pw/unquote-path-in-git-pm:
  t9700: add tests for Git::unquote_path()
  Git::unquote_path(): throw an exception on bad path
  Git::unquote_path(): handle '\a'
  add -i: move unquote_path() to Git.pm

We run an early part of "git gc" that deals with refs before
daemonising (and not under lock) even when running a background
auto-gc, which caused multiple gc processes attempting to run the
early part at the same time.  This is now prevented by running the
early part also under the GC lock.

* jk/gc-pre-detach-under-hook:
  gc: run pre-detach operations under lock

Code clean-up, that makes us in sync with Debian by one patch.

* jn/hooks-pre-rebase-sample-fix:
  pre-rebase hook: capture documentation in a <<here document

The progress meter did not give a useful output when we haven't had
0.5 seconds to measure the throughput during the interval.  Instead
show the overall throughput rate at the end, which is a much more
useful number.

* rs/progress-overall-throughput-at-the-end:
  progress: show overall rate in last update

On Cygwin, similar to Windows, "git push //server/share/repository"
ought to mean a repository on a network share that can be accessed
locally, but this did not work correctly due to stripping the double
slashes at the beginning.

This may need to be heavily tested before it gets unleashed to the
wild, as the change is at a fairly low-level code and would affect
not just the code to decide if the push destination is local.  There
may be unexpected fallouts in the path normalization.

* tb/push-to-cygwin-unc-path:
  cygwin: allow pushing to UNC paths

Code cleanup.

* rs/apply-avoid-over-reading:
  apply: use strcmp(3) for comparing strings in gitdiff_verify_name()
  apply: use starts_with() in gitdiff_verify_name()

A hotfix to a topic already in 'master'.

* js/blame-lib:
  blame: fix memory corruption scrambling revision name in error message

Signed-off-by: NAnthony Sottile <asottile@umich.edu>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

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

Git 2.11.3

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

Git 2.10.4

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

Git 2.9.5

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

Git 2.8.6

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

Git 2.7.6

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

Signed-off-by: NHartmut Henkel <henkel@vh-s.de>
Helped-by: NStefan Beller <sbeller@google.com>
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>
Acked-by: NMatthias Rüster <matthias.ruester@gmail.com>

* 'russian-l10n' of https://github.com/DJm00n/git-po-ru:
  l10n: ru.po: update Russian translation

Signed-off-by: NDimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>