Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Dec 2020 20:08:52 GMT
From:      Glen Barber <gjb@FreeBSD.org>
To:        doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
Subject:   git: 41c404416f - Fix argument order from previous commit.
Message-ID:  <202012132008.0BDK8qvS041591@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=41c404416f388900b5740efc6fbe96df10e860cc

commit 41c404416f388900b5740efc6fbe96df10e860cc
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2020-12-13 20:08:33 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2020-12-13 20:08:33 +0000

    Fix argument order from previous commit.
    
    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 b0ccc19eda..e8fe19f6fd 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 --rebase pull >> $LOGFILE 2>&1 || exit 2;
+		git -C main pull --rebase >> $LOGFILE 2>&1 || exit 2;
 	done
 fi
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012132008.0BDK8qvS041591>