Skip to content
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

[Feature plan] gs commit pick to cherry-pick a commit #372

Open
abhinav opened this issue Aug 30, 2024 · 0 comments · May be fixed by #536
Open

[Feature plan] gs commit pick to cherry-pick a commit #372

abhinav opened this issue Aug 30, 2024 · 0 comments · May be fixed by #536
Labels
enhancement New feature or request

Comments

@abhinav
Copy link
Owner

abhinav commented Aug 30, 2024

This is a tracking task to add a new command, gs commit pick to cherry-pick a commit.
There will be two modes of use:

  1. With an argument

    gs commit pick <hash>
    

    This just acts as an alias to git cherry-pick followed by an upstack restack.

  2. Without an argument

    gs commit pick
    

    This should present a terminal UI similar to gs branch split for selecting a commit from available tracked branches.
    image

@abhinav abhinav added the enhancement New feature or request label Aug 30, 2024
abhinav added a commit that referenced this issue 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:

- [ ] How to --continue/--abort/--skip on conflict or empty commit
- [ ] Repository.CherryPick operation
- [ ] Doc website update

Resolves #372
@abhinav abhinav linked a pull request Dec 29, 2024 that will close this issue
3 tasks
abhinav added a commit that referenced this issue 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?
- [ ] Doc website update

Resolves #372
abhinav added a commit that referenced this issue 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?
- [ ] Doc website update

Resolves #372
abhinav added a commit that referenced this issue 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?
- [ ] Doc website update

Resolves #372
abhinav added a commit that referenced this issue Jan 8, 2025
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant