From: Lars Schneider <larsxschneider@xxxxxxxxx> diff to v6: * fix spaces in .gitattributes for Git-LFS files (old "[:space:]", new "[[:space:]]") * generated patch on top of next (95c4325) to resolve merge conflicts I am sorry about the "[:space:]" bug this late. I had the fix in my development branch but missed to apply it in this patch series. @Junio: Your conflict resolution in pu looks good. Nevertheless, I made this patch on top of next to ease the integration. I hope this is ok. Cheers, Lars Lars Schneider (7): git-p4: add optional type specifier to gitConfig reader git-p4: add gitConfigInt reader git-p4: return an empty list if a list config has no values git-p4: add file streaming progress in verbose mode git-p4: check free space during streaming git-p4: add support for large file systems git-p4: add Git LFS backend for large file system Documentation/git-p4.txt | 32 +++++ git-p4.py | 278 ++++++++++++++++++++++++++++++++++++++++--- t/t9823-git-p4-mock-lfs.sh | 170 ++++++++++++++++++++++++++ t/t9824-git-p4-git-lfs.sh | 288 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 751 insertions(+), 17 deletions(-) create mode 100755 t/t9823-git-p4-mock-lfs.sh create mode 100755 t/t9824-git-p4-git-lfs.sh -- 2.5.1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html