Merge branch 'tv/p4-fallback-encoding' into jch
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2021 02:26:16 +0000 (11:26 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2021 02:26:16 +0000 (11:26 +0900)
commitfe61aa173a2b3deaffdba2dfdff7c4ed409913a0
tree156ae47839dbdd1f720237202cffc85f82f81560
parentb78c44bf45dc1cd69a328d7b1d2db3e45ba410c3
parent51a0478d2c65df251d69dda959f15260a5fbe50b
Merge branch 'tv/p4-fallback-encoding' into jch

"git p4" learns the fallbackEncoding configuration variable to
safely accept changeset descriptions that aren't written in UTF-8.

* tv/p4-fallback-encoding:
  git-p4: git-p4.fallbackEncoding to specify non UTF-8 charset
Documentation/git-p4.txt
git-p4.py