From owner-dev-commits-ports-main@freebsd.org  Tue May 25 16:03:31 2021
Return-Path: <owner-dev-commits-ports-main@freebsd.org>
Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8C7DD64FB69;
 Tue, 25 May 2021 16:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4FqJll3Z7nz3PRB;
 Tue, 25 May 2021 16:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:5])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 627232094F;
 Tue, 25 May 2021 16:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
 by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14PG3VH4069111;
 Tue, 25 May 2021 16:03:31 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14PG3VbN069110;
 Tue, 25 May 2021 16:03:31 GMT (envelope-from git)
Date: Tue, 25 May 2021 16:03:31 GMT
Message-Id: <202105251603.14PG3VbN069110@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
 dev-commits-ports-main@FreeBSD.org
From: Sofian Brabez <sbz@FreeBSD.org>
Subject: git: 5d2188800f7a - main - Makefile: Force to rebase when using make
 update
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: sbz
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 5d2188800f7a37ba58adf1fa42cb8ad820067b3f
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-ports-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the main branch of the FreeBSD ports repository
 <dev-commits-ports-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-ports-main>, 
 <mailto:dev-commits-ports-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-ports-main/>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Help: <mailto:dev-commits-ports-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-ports-main>, 
 <mailto:dev-commits-ports-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 May 2021 16:03:31 -0000

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 "--------------------------------------------------------------"