From 55fe387814fb295e7d64ad549a8b4665232f56e9 Mon Sep 17 00:00:00 2001 From: Alexander David Frick Date: Mon, 8 Aug 2022 00:11:35 -0500 Subject: [PATCH] Update trunk.sh --- trunk.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 &&