Merge branch 'ls/p4-path-encoding'
commit98f9556a442647db60dad9c7a754832c16af9e73
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Oct 2015 20:38:19 +0000 (7 13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Oct 2015 20:38:19 +0000 (7 13:38 -0700)
treeb427b3625d48b1ffa3cd1bedb7d399c9db5043eb
parenta23d263b69d353e6945281cd1a19fa6f1d0aaeee
parent4cb870d8042bef3fdd953c633463eda24ce78f3d
Merge branch 'ls/p4-path-encoding'

"git p4" learned to reencode the pathname it uses to communicate
with the p4 depot with a new option.

* ls/p4-path-encoding:
  git-p4: use replacement character for non UTF-8 characters in paths
  git-p4: improve path encoding verbose output
  git-p4: add config git-p4.pathEncoding
git-p4.py