git-absorb: also apply fix up commits
Jörg Thalheim committed
Jun 13, 2025 at 10:00 UTC
28e9b3d95c2d66fabf490b3849d26f6e0245905e
1 file changed
+4
-1
.github/scripts/format-and-absorb.sh
+4
-1
@@ -19,7 +19,10 @@ 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 --and-rebase
22
+# Create fixup commits
23
+git absorb --force --base origin/main
24
+# Then do a non-interactive autosquash rebase
25
+GIT_SEQUENCE_EDITOR=: git rebase -i --autosquash origin/main
26
echo "::endgroup::"
27
28
echo "::group::Pushing changes"