diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2020-12-13 20:05:19 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2020-12-13 20:05:19 +0000 |
| commit | 6d605a5aa5277260f9cd760dca016817e51f9f97 (patch) | |
| tree | c393480ef975f95d46c678d7f2dde6c1c2eee88a | |
| parent | dd95bbbc41a5aa1208d42501ae27421aa52b828b (diff) | |
| download | doc-6d605a5aa5277260f9cd760dca016817e51f9f97.tar.gz doc-6d605a5aa5277260f9cd760dca016817e51f9f97.zip | |
Website/docs build: ensure rebase is specified when pulling new updates
Sponsored by: Rubicon Communications, LLC (netgate.com)
| -rwxr-xr-x | share/tools/webupdate | 2 |
1 files changed, 1 insertions, 1 deletions
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 |