From d0e7c97a882f8575eb8ae66c513b80a057a8a54b Mon Sep 17 00:00:00 2001
From: Dolan <dolan_miu@hotmail.com>
Date: Sun, 16 Apr 2017 01:18:22 +0100
Subject: [PATCH] added commit message with merge with gh pages

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f2bad6461f..de7dbe61b6 100644
--- 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
\ No newline at end of file
+  - git push