Date: Sun, 13 Dec 2020 20:06:01 GMT From: Glen Barber <gjb@FreeBSD.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Subject: git: 6d605a5aa5 - Website/docs build: ensure rebase is specified when pulling new updates Message-ID: <202012132006.0BDK61NQ041430@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/doc/commit/?id=6d605a5aa5277260f9cd760dca016817e51f9f97 commit 6d605a5aa5277260f9cd760dca016817e51f9f97 Author: Glen Barber <gjb@FreeBSD.org> AuthorDate: 2020-12-13 20:05:19 +0000 Commit: Glen Barber <gjb@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012132006.0BDK61NQ041430>