We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 45ca873 commit 38b583eCopy full SHA for 38b583e
1 file changed
src/gitutils/_git-fix-up.sh
@@ -54,7 +54,7 @@ fi
54
# Start an interactive rebase with autosquash
55
git rebase -i --autosquash $sha~ --autostash --no-verify --reschedule-failed-exec --exec 'git hook run --ignore-missing pre-commit -- HEAD HEAD~1 && git commit --amend --no-edit --no-verify' --no-verify
56
57
-while [ $? -eq 0 ]; do
+while [ $? -ne 0 ]; do
58
59
# Check if there are any composer conflicts during the rebase
60
if [ -f composer.lock ]; then
@@ -79,7 +79,7 @@ while [ $? -eq 0 ]; do
79
fi
80
81
# Continue the rebase process
82
- git rebase --continue || true
+ git rebase --continue
83
done
84
85
# if rebase successful and push option is set, push force the changes
0 commit comments