Code Review
/
armband.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
779d3ab
)
Makefile: Fix `make upgrade` from same branch
73/49773/1
author
Alexandru Avadanii
<Alexandru.Avadanii@enea.com>
Fri, 29 Dec 2017 19:34:25 +0000
(20:34 +0100)
committer
Alexandru Avadanii
<Alexandru.Avadanii@enea.com>
Fri, 29 Dec 2017 19:33:33 +0000
(19:33 +0000)
Change-Id: I01d583995e0b557ec128111a3f5ff56684d9fb36
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
4eef836a99cd8c3c64e27adcb1e17ec5dc588116
)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
bd1ef6d
..
841b6b7
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-35,7
+35,7
@@
all: upgrade
# Ignore release tag and upgrade Armband to latest change on <branch>/HEAD
.PHONY: upgrade
upgrade:
- @git fetch origin ${A_BRANCH}:${A_BRANCH}
+ @git fetch
-u
origin ${A_BRANCH}:${A_BRANCH}
@git checkout ${A_BRANCH}
@$(MAKE) -e submodules-clean patches-import