Andrew's git / gitweb.git / diff
?
Merge branch 'ls/p4-empty-file-on-lfs'
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:27:49 +0000 (15:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:27:49 +0000 (15:27 -0800)
"git p4" LFS support was broken when LFS stores an empty blob.

* ls/p4-empty-file-on-lfs:
git-p4: fix empty file processing for large file system backend GitLFS

1  2 
git-p4.py patch | diff1 | diff2 | blob | history
diff --cc git-p4.py
Simple merge