aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-10 13:40:29 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-10 13:40:29 -0700
commit7a959426b61e673032861f7a89ce9c5254bd5830 (patch)
treec9196073c02b64935b55b7ba71e3d27aff4f5f43 /Documentation
parent934908ae5bcd7b9944d925f73e05c60b2687c8b7 (diff)
parent82f2567e3d01a6eeb4c6a0b9139232034de6e60f (diff)
downloadgit-7a959426b61e673032861f7a89ce9c5254bd5830.tar.gz
git-7a959426b61e673032861f7a89ce9c5254bd5830.tar.xz
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
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions