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
  • #3089
Closed
Open
Issue created Oct 11, 2017 by Chuck Lu@chucklu

Show parent SHA1 on cherry picking a merge commit

What steps will reproduce the problem?

  1. try to cherry pick a commit which is a merged commit

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

expected: cherry pick it

instead: a dialog showed,ask me to choose parent1 or parent2

TortoiseGitProc_2017-10-11_15-12-43

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

TortoiseGit 2.5.0.0 (C:\Program Files\TortoiseGit\bin)

git version 2.14.2.windows.1 (C:\Program Files\Git\bin; C:\Program Files\Git\mingw64; C:\Program Files\Git\mingw64\etc\gitconfig; C:\ProgramData\Git\config)

Microsoft Windows [Version 10.0.10586]

Please provide any additional information below.

TortoiseGit show me a dialog to choose parent,I have no idea about parent1 or parent2, if you can attach the commit sha-1 of parent,it would be better.

Edited Oct 15, 2017 by Sven Strickroth
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking