From: Adam Megacz <megacz@cs.berkeley.edu>
Date: Wed, 15 Jun 2011 19:32:23 +0000 (-0700)
Subject: Makefile: use -f when doing git pull for baked-in branch
X-Git-Url: http://git.megacz.com/?p=coq-hetmet.git;a=commitdiff_plain;h=7c9df3b89842f11d0bcb00ab24012160174e5f7a;ds=sidebyside

Makefile: use -f when doing git pull for baked-in branch
---

diff --git a/Makefile b/Makefile
index c35605a..c372b85 100644
--- a/Makefile
+++ b/Makefile
@@ -23,10 +23,10 @@ else
 	@echo ++ YOU DO NOT HAVE COQ VERSION $(coq_version_wanted) INSTALLED  ++
 	@echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 	@echo
-	@echo Therefore, I am going to "git pull" from the coq-extraction-baked-in
+	@echo Therefore, I am going to "git pull -f" from the coq-extraction-baked-in
 	@echo branch of the repository.
 	@echo
-	git pull http://git.megacz.com/coq-hetmet.git coq-extraction-baked-in:master
+	git pull -f http://git.megacz.com/coq-hetmet.git coq-extraction-baked-in:master
 endif