summaryrefslogtreecommitdiff
path: root/t/t7110-reset-merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-01-09 14:32:55 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-01-09 14:32:55 -0800
commit14c84cd55babd4b9016be825d9d9ffeea17065a2 (patch)
treed85899ba0f5053e18afde912855c876f31666574 /t/t7110-reset-merge.sh
parentMerge branch 'js/test-with-ws-in-path' (diff)
parenttravis-ci: check that all build artifacts are .gitignore-d (diff)
downloadtgif-14c84cd55babd4b9016be825d9d9ffeea17065a2.tar.xz
Merge branch 'sg/travis-check-untracked'
* sg/travis-check-untracked: travis-ci: check that all build artifacts are .gitignore-d travis-ci: don't store P4 and Git LFS in the working tree
Diffstat (limited to 't/t7110-reset-merge.sh')
0 files changed, 0 insertions, 0 deletions