summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-09-04 01:23:18 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-09-04 01:23:18 -0700
commitdb74dffd138bbe1e054b7bae4d8f5039d6c8844d (patch)
treebe904ff8f02c4a0c2aae9d9a175a2a807357594a
parent44706503a2003c44cfef8015580504b016b016c9 (diff)
Fixed update-site to do a pull first
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ee3c204..ca2825e 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ update-site: spec.html narrative.html
cp spec.html _site/
cp narrative.html _site/index.html
cp -r js/* _site/js/
- (cd _site ; git commit -a -m "Updated site for latest spec, narrative, js" ; git push; cd ..)
+ (cd _site ; git pull ; git commit -a -m "Updated site for latest spec, narrative, js" ; git push; cd ..)
clean:
-rm test $(SRCDIR)/*.o $(SRCDIR)/scanners.c