diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-02-13 13:39:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-13 13:39:16 -0800 |
| commit | 798224a1c97ccdeb5f80d97914c7447e356670ac (patch) | |
| tree | 01ecb24f54d2879986395a6e485c8c9f82cfbdad /notes-merge.h | |
| parent | Merge branch 'nd/list-merge-strategy' (diff) | |
| parent | travis-ci: don't fail if user already exists on 32 bit Linux build job (diff) | |
| download | tgif-798224a1c97ccdeb5f80d97914c7447e356670ac.tar.xz | |
Merge branch 'sg/travis-linux32-sanity'
Travis updates.
* sg/travis-linux32-sanity:
travis-ci: don't fail if user already exists on 32 bit Linux build job
travis-ci: don't run the test suite as root in the 32 bit Linux build
travis-ci: don't repeat the path of the cache directory
travis-ci: use 'set -e' in the 32 bit Linux build job
travis-ci: use 'set -x' for the commands under 'su' in the 32 bit Linux build
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions