diff --git a/scripts/pgit.sh b/scripts/pgit.sh index 462bfc48..c999e15d 100644 --- a/scripts/pgit.sh +++ b/scripts/pgit.sh @@ -182,7 +182,7 @@ clone() run_git -C $p fetch --prune --recurse-submodules=on-demand $remotename $fromref run_git -C $p submodule foreach --recursive 'git fetch --tags -f origin' if [ "$toref" ]; then - run_git -C $p rebase $remotename/$fromref $toref + run_git -C $p rebase --autostash $remotename/$fromref $toref run_git -C $p merge --ff-only $remotename/$fromref $toref fi else