]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7ab6da3 82f2567)
Merge branch 'ls/p4-lfs' into HEAD
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 May 2016 21:40:08 +0000 (14:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 May 2016 21:40:08 +0000 (14:40 -0700)
commit803fd70ceee3b86861d8b09b27861c4f85828b82
tree29c394c1ef12877d8f952aac5b0e3f55bbe7c886tree | snapshot
parent7ab6da3c40420c297016c0a62bece1573d0589cecommit | diff
parent82f2567e3d01a6eeb4c6a0b9139232034de6e60fcommit | diff
Merge branch 'ls/p4-lfs' into HEAD

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