projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eef32a0 862f931)
Merge branch 'ls/p4-lfs'
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Dec 2016 08:11:46 +0000 (00:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Dec 2016 08:11:46 +0000 (00:11 -0800)
commit7143258d79031648507a8066603ef04ec4413a21
tree2af760296f2158928ec8ab6d29acf844e1998bfdtree | snapshot
parenteef32a0653f9b4e90ace46c9f041ff41dbf4e632commit | diff
parent862f9312b3c910e5c8df6f96591fd3565d5a64eecommit | diff
Merge branch 'ls/p4-lfs'

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.