diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-27 00:11:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-27 00:11:46 -0800 |
| commit | 7143258d79031648507a8066603ef04ec4413a21 (patch) | |
| tree | 2af760296f2158928ec8ab6d29acf844e1998bfd /wrapper.c | |
| parent | eef32a0653f9b4e90ace46c9f041ff41dbf4e632 (diff) | |
| parent | 862f9312b3c910e5c8df6f96591fd3565d5a64ee (diff) | |
| download | git-7143258d79031648507a8066603ef04ec4413a21.tar.gz git-7143258d79031648507a8066603ef04ec4413a21.tar.xz | |
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
Diffstat (limited to 'wrapper.c')
0 files changed, 0 insertions, 0 deletions