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.
- Start a rebase of branch with several commits
- Select a first (lowest) commit
- Press Down button
- Using keyboard, select Edit option (press e). Nothing changed with the selected commit
- Press Start Rebase
- 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 220.127.116.11 (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