unsquash: deprecate in favor of squash and diffedit #4479
Merged
Conversation
This file contains 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
samueltardieu
force-pushed
the
deprecate-unsquash
branch
from
6444fcb to
7624dd1
Compare
samueltardieu
changed the title
samueltardieu
force-pushed
the
deprecate-unsquash
branch
from
7624dd1 to
9bb9a02
Compare
|
This is missing a meaningful deprecation message in |
samueltardieu
force-pushed
the
deprecate-unsquash
branch
from
9bb9a02 to
3aa7634
Compare
Right, fixed! |
samueltardieu
force-pushed
the
deprecate-unsquash
branch
from
3aa7634 to
70caa3e
Compare
|
I've explicitly solicited reviews so that people can tell whether they think this is a good thing or not. |
samueltardieu
force-pushed
the
deprecate-unsquash
branch
from
70caa3e to
1366ff3
Compare
|
I've never used |
martinvonz
reviewed
Sep 17, 2024
4 tasks
samueltardieu
force-pushed
the
deprecate-unsquash
branch
from
1366ff3 to
6fbce53
Compare
samueltardieu
changed the title
samueltardieu
force-pushed
the
deprecate-unsquash
branch
from
6fbce53 to
0b724e6
Compare
Everything that could be done with `jj unsquash` can be done with `jj squash` or `jj diffedit --preserve-descendants`.
samueltardieu
force-pushed
the
deprecate-unsquash
branch
from
0b724e6 to
2eadbd9
Compare
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.
Everything can be done with
jj diffedit --restore-descendantsandjj squashthat could be done withjj unsquash.Checklist
If applicable:
CHANGELOG.md