-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Closes #2959 autosquash commits in interactive rebases #4109
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.
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
Open
+5
−3
Conversation
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
@gabeseltzer
gabeseltzer
force-pushed
the
2959/autosquash
branch
from
February 26, 2025 18:29
f766b01 to
ab4767d
Compare
@gabeseltzer
gabeseltzer
force-pushed
the
2959/autosquash
branch
from
February 26, 2025 18:35
b1dc15f to
8aaa568
Compare
add contributor
@gabeseltzer
gabeseltzer
force-pushed
the
2959/autosquash
branch
from
February 26, 2025 18:38
8aaa568 to
abe7321
Compare
Author
gabeseltzer
commented
Mar 3, 2025
@eamodio sorry to ping you directly, but I wasn't sure if there was a proper way to set a reviewer, etc. Thanks!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Uh oh!
There was an error while loading. Please reload this page.
Description
Closes #2959
Adds the
--autosquashflag 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:
--autosquashto the arguments for the existing--interactiveline item for everyone. <<< This is what I did--autosquashto the arguments for the existing--interactiveline 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