projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5be6c1a 862f931)
Merge branch 'ls/p4-lfs' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Dec 2016 20:09:50 +0000 (12:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Dec 2016 20:09:50 +0000 (12:09 -0800)
commit0759f94c65b37aad19eb52c9eaea5c2e23644284
tree6eca0a6ecc8615ab6e7e95727bd37785d43bd137tree | snapshot
parent5be6c1a0839fdbbc49cf303387fb70e3fc0afe9acommit | diff
parent862f9312b3c910e5c8df6f96591fd3565d5a64eecommit | diff
Merge branch 'ls/p4-lfs' into next

Update GitLFS integration with "git p4".

* ls/p4-lfs:
  git-p4: add diff/merge properties to .gitattributes for GitLFS files
git-p4.py diff1 | diff2 | blob | history
t/t9824-git-p4-git-lfs.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.