Add a --siblings option to the jj split command #3037
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
emesterhazy
force-pushed
the
push-sxvnsknzvxku
branch
from
e265980 to
07fd3c8
Compare
emesterhazy
changed the title
emesterhazy
force-pushed
the
push-sxvnsknzvxku
branch
from
07fd3c8 to
71b65e5
Compare
martinvonz
reviewed
Mar 31, 2024
emesterhazy
force-pushed
the
push-sxvnsknzvxku
branch
2 times, most recently
from
985c1f0 to
4c5db0a
Compare
martinvonz
approved these changes
Apr 1, 2024
emesterhazy
force-pushed
the
push-sxvnsknzvxku
branch
3 times, most recently
from
320efd6 to
5049074
Compare
If the --siblings option is used, the target commit is split into two sibling commits instead of parent and child commits. Any children of the original commit will have both siblings as their new parents. #2274
|
I made a couple of minor tweaks, including adding the commit summary back to the instructions since I don't think I meant to delete it. I also fixed a couple of new conflicts with main. After this is submitted I'm going to mail another PR that adds test coverage for splitting a commit with branches. Currently the branches move to the second commit, but I know we're discussing whether the branches should stay with the original commit instead. I'll probably open a new issue to move that discussion to and then close the FR for |
emesterhazy
force-pushed
the
push-sxvnsknzvxku
branch
from
5049074 to
fe267f9
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.
If the --siblings option is used, the target commit is split into two sibling commits instead of parent and child commits. Any children of the original commit will have both siblings as their new parents.
#2274