Skip to content

Abort cherry-pick when resetting during rebase command #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magus merged 1 commit into from
Jan 17, 2026
Merged

Abort cherry-pick when resetting during rebase command #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/app/ManualRebase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ async function run() {
// always hard reset and clean to allow subsequent checkout
// if there are files checkout will fail and cascade fail subsequent commands
cli.sync(`git reset --hard`, spawn_options);
cli.sync(`git cherry-pick --abort`, spawn_options);
cli.sync(`git clean -fd`, spawn_options);

// always put self back in original branch
Expand Down
1 change: 1 addition & 0 deletions src/commands/Rebase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ Rebase.run = async function run(props: Props) {
// always hard reset and clean to allow subsequent checkout
// if there are files checkout will fail and cascade fail subsequent commands
cli.sync(`git reset --hard`, spawn_options);
cli.sync(`git cherry-pick --abort`, spawn_options);
cli.sync(`git clean -fd`, spawn_options);

// always put self back in original branch
Expand Down