summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorfujiwarat <takao.fujiwara1@gmail.com>2021-11-17 22:42:11 +0900
committerfujiwarat <takao.fujiwara1@gmail.com>2021-11-17 22:42:11 +0900
commit6162cb534ab496c48b3c310370f78a3aa9834df6 (patch)
treee01af426f9c8a4db53f74283e15f1eac2bb9766f /.travis.yml
parent28aa550f728b3848b06a67579aca5f563e64d447 (diff)
downloadibus-anthy-6162cb534ab496c48b3c310370f78a3aa9834df6.tar.gz
travis: git config pull.rebase false
`git pull` fails with local commits
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index f7a22c3..a9800a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,6 +40,7 @@ jobs:
- sudo apt-get -qq update
script:
- set -e
+ - git config pull.rebase false
- git pull --depth=200
# configure options from
# https://salsa.debian.org/debian/ibus-anthy/-/blob/master/debian/rules