Skip to content
GitLab
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
    Projects Groups Topics Snippets
  • Register
  • Sign in
  • TortoiseGit TortoiseGit
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 382
    • Issues 382
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 16
    • Merge requests 16
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGitTortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #1899
Closed
Open
Issue created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

Support cherry-picking merge revisions

By patr...@mezard.eu on September 05, 2013 06:58 (imported from Google Code)


What steps will reproduce the problem?

Create a merge revision and try to cherry pick it on another branch.

What is the expected output? What do you see instead?

The cherry pick operation proceeds but the git subcall eventually fails since the --parent-number option is not supplied. I would appreciate a way to be able to cherry pick at least a single merge revisions.

What version of TortoiseGit and msysgit are you using? On
what operating system?

TortoiseGit 1.8.4 on Windows 7.

Please provide any additional information below.

I have no straightforward answer as to how to design the UI for that. But I think restricting this feature to single merge revisions would be helpful already. The reason is you often cherry-pick merges to backport the result of a feature/bugfix branch to another branch. Also, I do not know how the command line reacts if passed multiple merge and a --parent-number option.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking