Re: [PATCH v1] git-p4: add diff/merge properties to .gitattributes for GitLFS files

2016-12-20 Thread Luke Diamand
On 19 December 2016 at 21:29, Junio C Hamano wrote: > larsxschnei...@gmail.com writes: > >> From: Lars Schneider >> >> 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.

Re: [PATCH v1] git-p4: add diff/merge properties to .gitattributes for GitLFS files

2016-12-19 Thread Junio C Hamano
larsxschnei...@gmail.com writes: > From: Lars Schneider > > 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/com

[PATCH v1] git-p4: add diff/merge properties to .gitattributes for GitLFS files

2016-12-18 Thread larsxschneider
From: Lars Schneider 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