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 /git-p4.py | |
| 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.xz 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 'git-p4.py')
| -rwxr-xr-x | git-p4.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-p4.py b/git-p4.py index b78af08cd2f..22e3f57e7d9 100755 --- a/git-p4.py +++ b/git-p4.py @@ -1120,10 +1120,10 @@ class GitLFS(LargeFileSystem): '# Git LFS (see https://git-lfs.github.com/)\n', '#\n', ] + - ['*.' + f.replace(' ', '[[:space:]]') + ' filter=lfs -text\n' + ['*.' + f.replace(' ', '[[:space:]]') + ' filter=lfs diff=lfs merge=lfs -text\n' for f in sorted(gitConfigList('git-p4.largeFileExtensions')) ] + - ['/' + f.replace(' ', '[[:space:]]') + ' filter=lfs -text\n' + ['/' + f.replace(' ', '[[:space:]]') + ' filter=lfs diff=lfs merge=lfs -text\n' for f in sorted(self.largeFiles) if not self.hasLargeFileExtension(f) ] ) |