Fix: autosquash command (r f) bug is fixed.#1880
Open
swnakamura wants to merge 2 commits intoNeogitOrg:masterfrom
Open
Fix: autosquash command (r f) bug is fixed.#1880swnakamura wants to merge 2 commits intoNeogitOrg:masterfrom
r f) bug is fixed.#1880swnakamura wants to merge 2 commits intoNeogitOrg:masterfrom
Conversation
Obtain new base as the parent of currently specified commit, and run a interactive (autosquashing) rebase onto the commit.
disrupted
reviewed
Feb 17, 2026
| base, | ||
| util.deduplicate(util.merge(popup:get_arguments(), { "--autosquash", "--keep-empty" })) | ||
| ) | ||
| git.rebase.rebase_interactive(base, args) |
Contributor
There was a problem hiding this comment.
is it even necessary to bring up the interactive editor view for this?
I think it would be even more convenient if this used the git.rebase.instantly path (similar to instant fixup).
Contributor
Author
There was a problem hiding this comment.
Thank you for the comment.
According to loqusion, Magit runs git … rebase -i --root --autosquash --keep-empty --autostash when running r f, so I implemented it in the way that shows an interactive view with autostash.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When
r fis pressed, obtain the parent of currently specified commit as new base and run a interactive (autosquashing) rebase onto the commit.Currently, there's a bug that deletes the rebased commits (#1620). This PR fixes it.