Merge branch 'jc/git-open-cloexec'

diff --git a/git-p4.py b/git-p4.py
index b78af08cd2fbdcb33e8fb19b4cba8e034e273592..22e3f57e7d93783ef6bb3f0bfd4ef2f6bbd0f93f 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -1120,10 +1120,10 @@ def generateGitAttributes(self):
                 '# 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)
             ]
         )