From owner-dev-commits-doc-all@freebsd.org Sun Dec 13 20:06:02 2020 Return-Path: Delivered-To: dev-commits-doc-all@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 100864C24BA for ; Sun, 13 Dec 2020 20:06:02 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CvFrp01bMz4qrG; Sun, 13 Dec 2020 20:06:02 +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 E7A66153F3; Sun, 13 Dec 2020 20:06:01 +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 0BDK61Zg041431; Sun, 13 Dec 2020 20:06:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BDK61NQ041430; Sun, 13 Dec 2020 20:06:01 GMT (envelope-from git) Date: Sun, 13 Dec 2020 20:06:01 GMT Message-Id: <202012132006.0BDK61NQ041430@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Glen Barber Subject: git: 6d605a5aa5 - Website/docs build: ensure rebase is specified when pulling new updates MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d605a5aa5277260f9cd760dca016817e51f9f97 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for all branches of the doc repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Dec 2020 20:06:02 -0000 The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/doc/commit/?id=6d605a5aa5277260f9cd760dca016817e51f9f97 commit 6d605a5aa5277260f9cd760dca016817e51f9f97 Author: Glen Barber AuthorDate: 2020-12-13 20:05:19 +0000 Commit: Glen Barber CommitDate: 2020-12-13 20:05:19 +0000 Website/docs build: ensure rebase is specified when pulling new updates Sponsored by: Rubicon Communications, LLC (netgate.com) --- share/tools/webupdate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/tools/webupdate b/share/tools/webupdate index ae008867c9..b0ccc19eda 100755 --- a/share/tools/webupdate +++ b/share/tools/webupdate @@ -143,7 +143,7 @@ else #svn cleanup $dir >> $LOGFILE 2>&1 || exit 2; #svn update --accept theirs-full $dir >> $LOGFILE 2>&1 || exit 2; git -C main clean -f >> $LOGFILE 2>&1 || exit 2; - git -C main pull >> $LOGFILE 2>&1 || exit 2; + git -C main --rebase pull >> $LOGFILE 2>&1 || exit 2; done fi