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 /commit.h | |
| parent | Merge branch 'va/i18n-even-more' (diff) | |
| parent | git-p4: add diff/merge properties to .gitattributes for GitLFS files (diff) | |
| download | git-7143258d79031648507a8066603ef04ec4413a21.tar.gz git-7143258d79031648507a8066603ef04ec4413a21.zip | |
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 'commit.h')
0 files changed, 0 insertions, 0 deletions