From e56741ca2054d1fb6df30ccbfc0eb004769ef316 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 25 Jul 2014 07:52:30 +0800 Subject: [PATCH] use rebase instead of merge in auto-update.sh --- auto-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto-update.sh b/auto-update.sh index e3c345e99..84f5d55d2 100755 --- a/auto-update.sh +++ b/auto-update.sh @@ -8,7 +8,7 @@ git add . git diff --quiet --exit-code --cached || git commit -m 'bla' ls git pull origin master -git merge master +git rebase master echo npm install for good measure /usr/local/bin/npm install