Closes #2959 autosquash commits in interactive rebases #4109
+5
−3
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.
Description
Closes #2959
Adds the
--autosquash
flag to interactive rebases.Note, I wasn't 100% sure if this is the right solution, but it works and was easy. As far as I know, there's no real downside to always using the autosquash feature. I had some other ideas but they were harder so I thought I'd PR and see what people thought. Here's the other options:
--autosquash
to the arguments for the existing--interactive
line item for everyone. <<< This is what I did--autosquash
to the arguments for the existing--interactive
line item if users enable it with a vscode extension setting--interactive --autosquash
, and show it all the time--interactive --autosquash
, and only show it if there are fixup commits in your rebase rangeChecklist
Fixes $XXX -
orCloses #XXX -
prefix to auto-close the issue that your PR addresses