summaryrefslogtreecommitdiff
path: root/decorate.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-18 14:40:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-18 14:40:08 -0700
commit803fd70ceee3b86861d8b09b27861c4f85828b82 (patch)
tree29c394c1ef12877d8f952aac5b0e3f55bbe7c886 /decorate.h
parentMerge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD (diff)
parentgit-p4: fix Git LFS pointer parsing (diff)
downloadtgif-803fd70ceee3b86861d8b09b27861c4f85828b82.tar.xz
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
Diffstat (limited to 'decorate.h')
0 files changed, 0 insertions, 0 deletions