Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit 9b0f80cd1a2d61574f0a1b5c533b2c549e38fdab 1 parent 2a9ac7b
@rwdaigle authored
Showing with 2 additions and 2 deletions.
  1. +1 −1  themes/clean
  2. +1 −1  update.sh
2  themes/clean
@@ -1 +1 @@
-Subproject commit 0eaa112d7de58a58007e27078bba21c10a2a4cc8
+Subproject commit 4dae6d66d6a211d4906c44602a8b4d2e2ca233f2
View
2  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 ../..
Please sign in to comment.
Something went wrong with that request. Please try again.