Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

WIP: new command: gs commit pick #536

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP: new command: gs commit pick #536

wants to merge 1 commit into from

Conversation

abhinav
Copy link
Owner

@abhinav abhinav commented Dec 29, 2024

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, not much different from 'git cherry-pick'.
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.

TODO:

  • --continue/--abort/--skip flags
  • handling of conflicts (continuing after)
  • Doc website update

Resolves #372

@abhinav
Copy link
Owner Author

abhinav commented Dec 29, 2024

This change is part of the following stack:

Change managed by git-spice.

@abhinav abhinav force-pushed the commit-pick branch 3 times, most recently from 0585009 to 0a9c17b Compare December 29, 2024 22:16
@abhinav
Copy link
Owner Author

abhinav commented Jan 9, 2025

(PR on hold until I decide how I want to handle cherry-pick failures.)

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, not much different from 'git cherry-pick'.
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.

TODO:

- [ ] --continue/--abort/--skip flags?
- [ ] Doc website update

Resolves #372
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature plan] gs commit pick to cherry-pick a commit
1 participant