Skip to content

log tab: bind s to squash changes from @ into the selected change#88

Merged
Cretezy merged 2 commits intoCretezy:mainfrom
blazingjj:add_squash_support
Feb 15, 2025
Merged

log tab: bind s to squash changes from @ into the selected change#88
Cretezy merged 2 commits intoCretezy:mainfrom
blazingjj:add_squash_support

Conversation

@dotdash
Copy link
Collaborator

@dotdash dotdash commented Jan 31, 2025

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.

@DemvSteinbrink DemvSteinbrink force-pushed the add_squash_support branch 3 times, most recently from c52d7ed to fde6d8c Compare February 3, 2025 09:22
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.
@Cretezy
Copy link
Owner

Cretezy commented Feb 15, 2025

Amazing!

@Cretezy Cretezy merged commit 896c07c into Cretezy:main Feb 15, 2025
5 of 10 checks passed
@DemvSteinbrink DemvSteinbrink deleted the add_squash_support branch February 17, 2025 11:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants