Merge pull request #60 from modilabs/master

Up
SEL-Columbia · Nov 3, 2013 · 6214f29 · 6214f29
2 parents 08dc4e4 + a3a82a7
commit 6214f29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/docs/index.rst b/docs/index.rst
@@ -1,7 +1,7 @@
 Welcome to the *bamboo* documentation!
 ======================================
 
-.. image:: https://raw.github.com/modilabs/bamboo/readme-cleanup/docs/images/bamboo_dev2013.png
+.. image:: https://raw.github.com/modilabs/bamboo/master/docs/images/bamboo_dev2013.png
    :height: 600
    :width: 800
 

diff --git a/fabfile.py b/fabfile.py
@@ -50,6 +50,8 @@ def deploy(deployment_name):
 
     # update code
     with cd(env.code_src):
+        run('git fetch origin %(branch)s' % env)
+        run('git reset --hard origin/%(branch)s' % env)
         run('git pull origin %(branch)s' % env)
         run('find . -name "*.pyc" -delete')