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
  • #3956
Closed
Open
Issue created Sep 05, 2022 by Mingun@Mingun

Sometimes rebase contains wrong list of files

What steps will reproduce the problem?

Sometimes when doing a rebase and select the Edit option, TortoiseGit starts to edit not that commit, but probably previous one. The original commit can be lost during that operation.

  1. Start a rebase of branch with several commits
  2. Select a first (lowest) commit
  3. Press Down button
  4. Using keyboard, select Edit option (press e). Nothing changed with the selected commit
  5. Press Start Rebase
  6. Although all commits are shown as Pick, you'll get an Amend dialog for a commit which was selected as base for rebase

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

On step 4 the first commit should change their status to Edit.

On step 6 all commits should picked (if you don't edit the right commit on the step 4)

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

Windows 7, 10 and 11

TortoiseGit About:

TortoiseGit 2.13.1.0 (20220823-fd2f015; D:\Tools\VCS\TortoiseGit\bin)
git version 2.33.1.windows.1 (D:\Tools\VCS\Git\bin; D:\Tools\VCS\Git\mingw64\; D:\Tools\VCS\Git\etc\gitconfig)

Please provide any additional information below.

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