Date: Tue, 25 May 2021 16:03:31 GMT From: Sofian Brabez <sbz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5d2188800f7a - main - Makefile: Force to rebase when using make update Message-ID: <202105251603.14PG3VbN069110@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sbz: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d2188800f7a37ba58adf1fa42cb8ad820067b3f commit 5d2188800f7a37ba58adf1fa42cb8ad820067b3f Author: Sofian Brabez <sbz@FreeBSD.org> AuthorDate: 2021-05-25 07:35:30 +0000 Commit: Sofian Brabez <sbz@FreeBSD.org> CommitDate: 2021-05-25 16:01:19 +0000 Makefile: Force to rebase when using make update Approved by: uqs Differential Revision: https://reviews.freebsd.org/D30450 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3ca0ba4cabd3..ad4b13aec200 100644 --- a/Makefile +++ b/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 "--------------------------------------------------------------"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105251603.14PG3VbN069110>