diff options
| author | fujiwarat <takao.fujiwara1@gmail.com> | 2021-11-17 22:54:00 +0900 |
|---|---|---|
| committer | fujiwarat <takao.fujiwara1@gmail.com> | 2021-11-17 22:54:00 +0900 |
| commit | d53d31d2dbab00e13e23862cf2bf88da532b9465 (patch) | |
| tree | 62f472daf0adb91bb8059a7d5ba50a852e6378a3 | |
| parent | 28acfd433b3df1673b7c7177915c027ce48c061e (diff) | |
| download | ibus-d53d31d2dbab00e13e23862cf2bf88da532b9465.tar.gz | |
travis: git config pull.rebase false
`git pull` fails with local commits
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index a7c0dd46..abd40e7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,7 @@ jobs: - SAVE_DIST_FILES=1 script: - set -e + - git config pull.rebase false - git pull --depth=200 # configure options from # https://salsa.debian.org/debian/ibus/-/blob/master/debian/rules |