From 71579fb5bbac092766cf5d5f6a625fb9fc8860a8 Mon Sep 17 00:00:00 2001
From: Huan LI <zixia@zixia.net>
Date: Fri, 17 Mar 2017 09:21:42 +0800
Subject: [PATCH] rebase before push by default

---
 bin/pre-push | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/pre-push b/bin/pre-push
index 3456a0ac..935e234c 100755
--- a/bin/pre-push
+++ b/bin/pre-push
@@ -19,6 +19,7 @@ npm run lint
 
 [ -z "$CYGWIN" ] && {
   npm version patch
+  git rebase
   WECHATY_INNER_PRE_HOOK=1 git push
 
   echo
@@ -34,6 +35,6 @@ npm run lint
 
 # must run this after the above `test` ([ -z ...]),
 # or will whow a error: error: failed to push some refs to 'git@github.com:wechaty/wechaty.git'
-echo "PRE-PUSH HOOK PASSED" 
+echo "PRE-PUSH HOOK PASSED"
 echo
 
-- 
GitLab