git-absorb: also rebase
Jörg Thalheim committed
Jun 13, 2025 at 07:59 UTC
0e1f8c18172fcd605162c195d3936deb821472b5
1 file changed
+2
-2
.github/scripts/format-and-absorb.sh
+2
-2
@@ -19,11 +19,11 @@ echo "::endgroup::"
19
echo "::group::Running git absorb"
20
# Run git absorb with --force to automatically absorb changes
21
git add -A
22
-git absorb --force --base origin/main
22
+git absorb --force --base origin/main --and-rebase
23
echo "::endgroup::"
24
25
echo "::group::Pushing changes"
26
-git push
26
+git push --force-with-lease
27
echo "::endgroup::"
28
29
echo "Successfully formatted code and absorbed changes!"