diff options
| author |  Amine Mouafik <amine@mouafik.fr> | 2020-10-02 22:24:42 +0100 |
|---|---|---|
| committer | Amine Mouafik <amine@mouafik.fr> | 2020-10-02 22:24:42 +0100 |
| commit | f619162e577d1b373f28290c7f6cf5ba5c65d3d7 (patch) | |
| tree | b85c4da0aab0a067373ce8e2321f70bf2a3f04c5 /.travis.yml | |
| parent | 5.6.0-nightly.2 and trigger AppVeyor nightly build [skip travisci] (diff) | |
| download | ferdium-app-f619162e577d1b373f28290c7f6cf5ba5c65d3d7.tar.gz ferdium-app-f619162e577d1b373f28290c7f6cf5ba5c65d3d7.tar.zst ferdium-app-f619162e577d1b373f28290c7f6cf5ba5c65d3d7.zip | |
Avoid commit edit prompt when merging
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index a62b086c8..192161387 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -31,7 +31,7 @@ before_install: | |||
| 31 | if [ $TRAVIS_BRANCH == "nightly"]; then | 31 | if [ $TRAVIS_BRANCH == "nightly"]; then |
| 32 | git config --replace-all remote.origin.fetch +refs/heads/*:refs/remotes/origin/* | 32 | git config --replace-all remote.origin.fetch +refs/heads/*:refs/remotes/origin/* |
| 33 | git fetch | 33 | git fetch |
| 34 | git merge --no-ff origin/develop | 34 | git merge --no-ff --commit --no-edit origin/develop |
| 35 | fi | 35 | fi |
| 36 | install: | 36 | install: |
| 37 | - cd recipes && npm install && npm run package && cd .. | 37 | - cd recipes && npm install && npm run package && cd .. |