guberm / tortoisegit

Automatically exported from code.google.com/p/tortoisegit
0 stars 0 forks source link

Prompt for stash before rebase is not matched with pop stash after rebase #2509

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago
What steps will reproduce the problem?
1. Make the working directory dirty
2. Rebase
3. In the dialog that says "stash or abort", click "stash"
4. Rebase
5. Finish the rebase

What is the expected output? What do you see instead?
The rebase is fine. However, I should be prompted to pop the stash that I just 
created.

What version of TortoiseGit and msysgit are you using? On
what operating system?
1.8.14.0, git 1.9.5.msysgit.1

Please provide any additional information below.
If I open the rebase dialog, then make modifications, then click rebase, at the 
end of the rebase the dialog does ask me to stash pop. It would be useful if 
the same prompt is given if the stash is at the start of the whole rebase 
process also.

Original issue reported on code.google.com by j...@joelsplace.sg on 18 May 2015 at 8:53

GoogleCodeExporter commented 9 years ago
Make step 2 clear:
1. Make the working directory dirty
2. Use context menu item TortoiseGit -> Rebase
3. ...

A workaround:
Use Rebase item in Log Message dialog.

Original comment by yuelinho...@gmail.com on 18 May 2015 at 9:23

GoogleCodeExporter commented 9 years ago
This issue was closed by revision 882c7c6ac016.

Original comment by sstrickr...@googlemail.com on 19 May 2015 at 4:17