Update theme. Update update script to do an upstream merge vs. rebase

rwdaigle · Feb 24, 2012 · 9b0f80c · 9b0f80c
1 parent 2a9ac7b
commit 9b0f80c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/themes/clean b/themes/clean
diff --git a/update.sh b/update.sh
@@ -4,7 +4,7 @@ git commit -m "Commit changes prior to template update"
 git checkout upstream
 git pull upstream master
 git checkout master
-git rebase upstream
+git merge upstream
 cd themes/clean
 git pull origin master
 cd ../..