cmark

Unnamed repository; edit this file 'description' to name the repository.

commit db74dffd138bbe1e054b7bae4d8f5039d6c8844d
parent 44706503a2003c44cfef8015580504b016b016c9
Author: John MacFarlane <jgm@berkeley.edu>
Date:   Thu,  4 Sep 2014 01:23:18 -0700

Fixed update-site to do  a pull first

Diffstat:
MMakefile | 2+-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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