Skip to content
GitLab
  • Menu
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
  • TortoiseGit TortoiseGit
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 367
    • Issues 367
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 14
    • Merge requests 14
  • 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
  • #1597
Closed
Open
Issue created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

Reduce chance of committing old submodule revision on cherry-pick / rebase conflicts

By @ch3cooli on January 21, 2013 05:46 (imported from Google Code)


Unlike merge, which may have conflicts for one time only,
there may be multiple times of conflicts during cherry-picking / rebasing.
Currently, rebase dialog automatically stages any files and submodules.
There is no checkbox to uncheck unwanted changes.
Therefore, we need to run submodule update multiple times during cherry-picking / rebasing.
Prompt to update submodule is not a good solution, because if using command line, the extra steps are not necessary.
If forget to run submodule update, it stages the old revision which is wrong!

Suggestion: show checkboxes in GitStatusCtrl, just like Commit Dialog.

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

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