os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Website/docs build: ensure rebase is specified when pulling new updates

Browse source 
Sponsored by:	Rubicon Communications, LLC (netgate.com)
This commit is contained in:
Glen Barber 2020-12-13 15:05:19 -05:00
parent dd95bbbc41
commit 6d605a5aa5
1 changed files with 1 additions and 1 deletions

2
share/tools/webupdate
View file

@ -143,7 +143,7 @@ else
#svn cleanup $dir >> $LOGFILE 2>&1 || exit 2; #svn cleanup $dir >> $LOGFILE 2>&1 || exit 2;
#svn update --accept theirs-full $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 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 done
fi fi