From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 7 Oct 2015 20:38:19 +0000 (-0700)
Subject: Merge branch 'ls/p4-path-encoding'
X-Git-Tag: v2.7.0-rc0~124
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=98f9556a442647db60dad9c7a754832c16af9e73;p=git-core%2Fgit.git

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
---

98f9556a442647db60dad9c7a754832c16af9e73