diff options
| -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 e8fe19f6fd..e393fd7854 100755 --- a/share/tools/webupdate +++ b/share/tools/webupdate @@ -142,7 +142,7 @@ else for dir in ${subtrees}; do #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 clean -f >> $LOGFILE 2>&1 || exit 2; git -C main pull --rebase >> $LOGFILE 2>&1 || exit 2; done fi |