Andrew's git / gitweb.git / diff
?
Merge branch 'ls/p4-lfs'
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 May 2016 20:40:29 +0000 (13:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 May 2016 20:40:29 +0000 (13:40 -0700)
Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.

* ls/p4-lfs:
git-p4: fix Git LFS pointer parsing
travis-ci: express Linux/OS X dependency versions more clearly
travis-ci: update Git-LFS and P4 to the latest version

1  2 
git-p4.py patch | diff1 | diff2 | blob | history
t/t9824-git-p4-git-lfs.sh patch | diff1 | diff2 | blob | history
diff --cc git-p4.py
Simple merge
diff --cc t/t9824-git-p4-git-lfs.sh
Simple merge