Permalink
Browse files

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

  • Loading branch information...
1 parent 2a9ac7b commit 9b0f80cd1a2d61574f0a1b5c533b2c549e38fdab @rwdaigle committed Feb 24, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 themes/clean
  2. +1 −1 update.sh
Submodule clean updated 1 files
+11 −7 views/master.sass
View
@@ -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 ../..

0 comments on commit 9b0f80c

Please sign in to comment.