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 380
    • Issues 380
    • 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
  • #3784
Closed
Open
Issue created Aug 23, 2021 by Marcono1234@Marcono1234

Rebase dialog does not ask to pop stash when post rebase options in the lower left are used

What steps will reproduce the problem?

  1. Create a new local Git repository
  2. Commit a file test.txt with arbitrary content
  3. Create a branch called 'other' and switch to that branch
  4. Create a second arbitrary commit on that branch
  5. Modify test.txt
  6. Open "Rebase..."
  7. Select 'main' (respectively 'master') as Upstream and check "Force Rebase"
  8. Click "Start Rebase", and on the shown dialog select "Stash"
  9. After the Rebase finished, within the Rebase dialog select either "Show log" or "Restart rebase" in the lower left corner
    ❌ You are not asked to pop the stash

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

You are not asked to pop the changes you pushed to stash before the rebase

Expected would be that:

  • In the case of "Show log": You are asked to pop the stash before being shown the log
  • In the case of "Restart rebase": You are asked to pop the stash after the restarted rebase

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

  • TortoiseGit 2.12.0.0
  • git version 2.33.0.windows.1
  • Windows 10

Please provide any additional information below.

Edited Dec 29, 2021 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