Makefile: Force to rebase when using make update
Approved by: uqs Differential Revision: https://reviews.freebsd.org/D30450
This commit is contained in:
parent
07d1217a85
commit
5d2188800f
2
Makefile
2
Makefile
@ -189,7 +189,7 @@ update:
|
||||
@echo "--------------------------------------------------------------"
|
||||
@echo ">>> Updating ${.CURDIR} from git repository"
|
||||
@echo "--------------------------------------------------------------"
|
||||
cd ${.CURDIR}; ${GIT} pull
|
||||
cd ${.CURDIR}; ${GIT} pull --rebase
|
||||
. endif
|
||||
.elif defined(RSYNC_UPDATE) && defined(PORTS_RSYNC_SOURCE)
|
||||
@echo "--------------------------------------------------------------"
|
||||
|
Loading…
Reference in New Issue
Block a user