Visitar URL original
feat: gs commit pick (experimental) by abhinav · Pull Request #536 · abhinav/git-spice · GitHub
Skip to content

feat: gs commit pick (experimental) - #536

Merged
abhinav merged 1 commit into
mainfrom
commit-pick
Oct 18, 2025
Merged

abhinav merged 1 commit into
mainfrom
commit-pick

Conversation

@abhinav

@abhinav abhinav commented Dec 29, 2024 •

Copy link
Copy Markdown
Owner

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 ',
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

@abhinav

abhinav commented Dec 29, 2024 •

Copy link
Copy Markdown
Owner Author

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

abhinav commented Jan 9, 2025

Copy link
Copy Markdown
Owner Author

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

@abhinav
abhinav changed the base branch from main to commit-pick-widget June 14, 2025 14:23
@abhinav
abhinav force-pushed the commit-pick branch 2 times, most recently from c366661 to ec0aa78 Compare June 15, 2025 19:22
@abhinav
abhinav force-pushed the commit-pick-widget branch from dde5dc2 to cdd96ee Compare June 26, 2025 02:18
@abhinav
abhinav force-pushed the commit-pick-widget branch 2 times, most recently from d074c3c to 5ea3b1f Compare August 31, 2025 23:08
Base automatically changed from commit-pick-widget to main August 31, 2025 23:14
@abhinav
abhinav force-pushed the commit-pick branch 2 times, most recently from 850e75f to 5607c50 Compare September 1, 2025 03:25
@abhinav
abhinav force-pushed the commit-pick branch 2 times, most recently from ec452b5 to 94e17e3 Compare October 18, 2025 22:46
@abhinav abhinav changed the title WIP: new command: gs commit pick feat: gs commit pick (experimental) Oct 18, 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 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
@abhinav
abhinav marked this pull request as ready for review October 18, 2025 23:44
@abhinav
abhinav enabled auto-merge (squash) October 18, 2025 23:50
@abhinav
abhinav merged commit bc3b8ed into main Oct 18, 2025
@abhinav
abhinav deleted the commit-pick branch October 18, 2025 23:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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