Skip to content

Emphasise the cherry-pick --skip option #320

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.

Sign up for GitHub

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

Jump to bottom
Closed
Denton-L opened this issue Aug 23, 2019 · 3 comments
Closed

Emphasise the cherry-pick --skip option #320

Denton-L opened this issue Aug 23, 2019 · 3 comments

Comments

@Denton-L
Copy link
Member

Denton-L commented Aug 23, 2019 •
edited
Loading

In the case of conflicts while cherry-picking, one can pass in the --skip flag and it'll skip the problematic patch. However, this option is not suggested by completions nor is it suggested when running git status, unlike when we're rebasing.
@Denton-L Denton-L changed the title Teach cherry-pick the --skip option Emphasise the cherry-pick --skip option Aug 24, 2019
@weekly-digest weekly-digest bot mentioned this issue Aug 25, 2019
Closed
@Denton-L
Copy link
Member Author

Currently cooking here: https://github.com/gitster/git/commits/dl/complete-cherry-pick-revert-skip

@Denton-L
Copy link
Member Author

Merged here: gitster@21db12c

@dscho
Copy link
Member

dscho commented Oct 1, 2019

Merged here: gitster@21db12c

Great!

FWIW you can close these gitgitgadget/git issues by adding a line This fixes <URL> into the commit message. Worked for me in the past ;-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@dscho @Denton-L