added commit message with merge with gh pages

2017-04-16 01:18:22 +01:00
parent 0ede54cfdc
commit d0e7c97a88
1 changed files with 2 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -10,8 +10,8 @@ after_failure:
  - "cat /home/travis/builds/dolanmiu/docx/npm-debug.log"
 after_success:
  - git checkout gh-pages
-  - git merge master
+  - git merge master --ff -m "merging with master"
  - npm run typedoc
  - git add .
  - git commit -a -m 'updated documentation'
-  - git push
+  - git push