projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 934908a 82f2567)
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)
commit7a959426b61e673032861f7a89ce9c5254bd5830
treec9196073c02b64935b55b7ba71e3d27aff4f5f43tree | snapshot
parent934908ae5bcd7b9944d925f73e05c60b2687c8b7commit | diff
parent82f2567e3d01a6eeb4c6a0b9139232034de6e60fcommit | diff
Merge branch 'ls/p4-lfs'

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
git-p4.py diff1 | diff2 | blob | history
t/t9824-git-p4-git-lfs.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.