Skip to content

Emphasise the cherry-pick --skip option #320

Closed

Description

@Denton-L

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.

Activity

  1. changed the title [-]Teach cherry-pick the --skip option[/-] [+]Emphasise the cherry-pick --skip option[/+] on Aug 24, 2019
  2. Denton-L commented on Sep 18, 2019

    @Denton-L
    MemberAuthor
  3. Denton-L commented on Sep 30, 2019

    @Denton-L
    MemberAuthor

    Merged here: gitster@21db12c

  4. dscho commented on Oct 1, 2019

    @dscho
    Member

    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

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions