From 7c9df3b89842f11d0bcb00ab24012160174e5f7a Mon Sep 17 00:00:00 2001 From: Adam Megacz Date: Wed, 15 Jun 2011 12:32:23 -0700 Subject: [PATCH] Makefile: use -f when doing git pull for baked-in branch --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 1.7.10.4