projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 82f2567) | patch
git-p4: add diff/merge properties to .gitattributes for GitLFS files
authorLars Schneider <larsxschneider@gmail.com>
Sun, 18 Dec 2016 19:01:40 +0000 (20:01 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2016 18:01:00 +0000 (10:01 -0800)
commit862f9312b3c910e5c8df6f96591fd3565d5a64ee
tree1a532f883ba1c3810d7317379779727e95c69b4atree | snapshot
parent82f2567e3d01a6eeb4c6a0b9139232034de6e60fcommit | diff
git-p4: add diff/merge properties to .gitattributes for GitLFS files

The `git lfs track` command generates a .gitattributes file with diff
and merge properties [1]. Set the same .gitattributes format for files
tracked with GitLFS in git-p4.

[1] https://github.com/git-lfs/git-lfs/blob/v1.5.3/commands/command_track.go#L121

Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Reviewed-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-p4.py diff | blob | blame | history
t/t9824-git-p4-git-lfs.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.