log tab: bind s to squash changes from @ into the selected change#88
Merged
Cretezy merged 2 commits intoCretezy:mainfrom Feb 15, 2025
Merged
log tab: bind s to squash changes from @ into the selected change#88Cretezy merged 2 commits intoCretezy:mainfrom
s to squash changes from @ into the selected change#88Cretezy merged 2 commits intoCretezy:mainfrom
Conversation
c52d7ed to
fde6d8c
Compare
For now, this just squashes everything into the selected commit, which is quite a large hammer, but still useful when working on in a mega merge workflow and pushing down a whole set of changes into a new parent. It would be useful to add a way to do an interactive squashing, but the current support to run jj command only allows non-interactive ones, so we'll have to add that later.
fde6d8c to
92da580
Compare
Cretezy
reviewed
Feb 15, 2025
Cretezy
approved these changes
Feb 15, 2025
Owner
|
Amazing! |
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
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.
For now, this just squashes everything into the selected commit, which is quite a large hammer, but still useful when working on in a mega merge workflow and pushing down a whole set of changes into a new parent.
It would be useful to add a way to do an interactive squashing, but the current support to run jj command only allows non-interactive ones, so we'll have to add that later.