]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'dl/p4-encode-after-kw-expansion' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Feb 2021 22:05:54 +0000 (14:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Feb 2021 22:05:54 +0000 (14:05 -0800)
Text encoding fix for "git p4".

* dl/p4-encode-after-kw-expansion:
  git-p4: fix syncing file types with pattern

1  2 
git-p4.py

diff --cc git-p4.py
Simple merge