diff --git a/trunk.sh b/trunk.sh index 7935e550..9e8df41f 100644 --- a/trunk.sh +++ b/trunk.sh @@ -56,9 +56,9 @@ gsyncShallow () { git checkout -f origin/main && - git rebase-update && + git rebase-update --current && - gclient sync -f -R -D --no-history --shallow && + gclient sync -R -D --no-history --shallow && gclient runhooks &&