projects
/
coq-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
542be54
)
Makefile: use -f when doing git pull for baked-in branch
author
Adam Megacz
<megacz@cs.berkeley.edu>
Wed, 15 Jun 2011 19:32:23 +0000
(12:32 -0700)
committer
Adam Megacz
<megacz@cs.berkeley.edu>
Wed, 15 Jun 2011 19:32:23 +0000
(12:32 -0700)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
c35605a
..
c372b85
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-23,10
+23,10
@@
else
@echo ++ YOU DO NOT HAVE COQ VERSION $(coq_version_wanted) INSTALLED ++
@echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@echo
@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
@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
endif