use rebase instead of merge in auto-update.sh

2026-08-09 04:46:00 +10:00 · 2014-07-25 07:52:30 +08:00
parent 619da36665
commit e56741ca20
1 changed files with 1 additions and 1 deletions
@@ -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