Skip to content

Commit 48c9b12

Browse files
committed
feat: implement rebase_skip with external abort detection and chain validation
- Add rebase_skip(): abort git rebase, restore branch from saved OID, mark as Skipped, resume from next pending branch - Add external git rebase --abort detection in rebase_continue(): compare branch OID with original_ref to detect bypassed aborts - Add chain modification validation in both --continue and --skip: warn and skip branches that were deleted during chain rebase - Route --skip flag in command handler - Update conflict error messages to mention --skip option
1 parent 796be39 commit 48c9b12

2 files changed

Lines changed: 344 additions & 4 deletions

File tree

src/commands.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,8 @@ pub fn run(arg_matches: ArgMatches) -> Result<(), Error> {
260260
("rebase", Some(sub_matches)) => {
261261
if sub_matches.is_present("continue_rebase") {
262262
git_chain.rebase_continue()?;
263+
} else if sub_matches.is_present("skip_rebase") {
264+
git_chain.rebase_skip()?;
263265
} else if sub_matches.is_present("abort_rebase") {
264266
git_chain.rebase_abort()?;
265267
} else {

0 commit comments

Comments
 (0)