mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-11-21 04:46:29 +03:00
If a lock stops "git rebase --skip" after git has applied the changes of the next commit but before it has committed them, running it again discards those staged changes, and the commit is lost. Something similar happens with "git cherry-pick --continue" and "--skip" (and the same for revert). If the lock stops them at the next commit, git doesn't reschedule that commit, and running them again skips it. For a rebase, handle continue and skip like the commands that start a rebase. Run the command again if the lock stopped it before it changed the state of the rebase, continue if git rescheduled the todo that failed, and give up otherwise. For a cherry-pick or revert, run the command again if it didn't change the todos in .git/sequencer, and give up otherwise. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>