-
-
Notifications
You must be signed in to change notification settings - Fork 43
feat: gs commit pick (experimental) #536
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
Merged
Merged
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
Owner
Author
|
This change is part of the following stack:
Change managed by git-spice. |
0585009 to
0a9c17b
Compare
Owner
Author
|
(PR on hold until I decide how I want to handle cherry-pick failures.) |
c366661 to
ec0aa78
Compare
dde5dc2 to
cdd96ee
Compare
d074c3c to
5ea3b1f
Compare
850e75f to
5607c50
Compare
This was referenced Sep 1, 2025
ec452b5 to
94e17e3
Compare
Allows cherry-picking commits into the current branch
and restacks the upstack.
Two modes of usage:
gs commit pick <commit>
gs commit pick
In the first mode, same as 'git cherry-pick <commit>',
except it also restacks the upstack branches afterwards.
In latter form, presents a visualization of commits in upstack branches
to allow selecting one.
--from=other can be used to view branches and commits from elsewhere.
Limitations:
- Does not support cherry-picking merge commits
- Does not support cherry-picking commits that would cause a conflict
Resolves #372
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.
Allows cherry-picking commits into the current branch
and restacks the upstack.
Two modes of usage:
In the first mode, same as 'git cherry-pick ',
except it also restacks the upstack branches afterwards.
In latter form, presents a visualization of commits in upstack branches
to allow selecting one.
--from=other can be used to view branches and commits from elsewhere.
Limitations:
Resolves #372