Merge branch 'ab/pathname-encoding-doc'
authorJunio C Hamano <gitster@pobox.com>
Fri, 30 Apr 2021 04:50:27 +0000 (13:50 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 Apr 2021 04:50:27 +0000 (13:50 +0900)
commit93e0b28dbb4c1a2cbdce1da8e229af075c2fa092
treea2c31aa765f27d752d2a20b1c94586202dcde8dc
parent5980e0d44258a6cccf1e5995947d4cba15145924
parent9364bf465d23ff26f5e2eb4ee52434e7a69894f1
Merge branch 'ab/pathname-encoding-doc'

Clarify that pathnames recorded in Git trees are most often (but
not necessarily) encoded in UTF-8.

* ab/pathname-encoding-doc:
  doc: clarify the filename encoding in git diff
Documentation/diff-options.txt