![]() So the stash pop does not round trip the status to the way it was before the stash. It doesn't matter whether I try to stash the changes via the Git Extensions GUI or via the console.ĮDIT: If I stage all 4 changes before stashing, when I do a stash pop the 3 problem changes are staged, as before, but the good change, which always stashes, is uncommitted. I'm using Git for Windows 2.8.2 and Git Extensions 2.48.05. For apply or delete a stash you can use the Stashes menu in the sidebar. Is this a bug or am I doing something wrong? In Sourcetree for push a new stash you need select the Stash button in the top toolbar. If the "problem" changes are staged then all changes are stashed (doesn't matter whether the "good" change is staged or not, it will always stash). ![]() I've played around and this is repeatable: If all changes are uncommitted, only the one change is stashed. However, by coincidence I found that when I first stage the previously unstashable changes, they will be stashed normally. ![]() Tried it a couple of times and after the first attempt I was just getting "No local changes to save", yet the status still showed the 3 uncommitted changes. 1 file was added to the stash, the remaining 3 stayed as uncommitted changes. It seems to be only partially working for me.įor example today I tried to stash 4 uncommitted changes. ![]() Lately I've noticed some strange behaviour relating to stashing. git stash show -p the command you are looking for.I'm no great expert at git but I've been using it for a couple of years. This question have been asked here more than once. Then stash all files, but making sure that Keep staged changes is checked. Copy your project folder and open the folder with SourceTree. To stash select files: Stage the files you want to stash.They will be available in case you want them back at a later point. One ugly trick to see the whole stash is: If you want to preserve your local changes, you can safely store them on a Stash. The repository is a GIT repository if that makes a difference.Ĭan be fixed (in latest version?) by increasing the Max File Count and Max Diff Line Count in the Tools > Options > Diff:įor some reason I don't see the "Max File Count" field on SourceTree 4.0.1 (234) on macOS. On the other hand, this is just a workaround. This way, all files are stashed including untracked. I know that I can get around this in several different ways, but if there is an option somewhere that I don't know of which would make SourceTree show the full contents of the stash, I'd be very pleased if someone could tell me where to find it. As a workaround, you can stage all files and then stash them. Can be fixed (in latest version) by increasing the Max File Count and Max Diff Line. For me, SourceTree shows only a part of the stash as some kind of summary. The commandline command is pretty obscure, so Id be surprised if it has. Is there a way in SourceTree to see the whole content of a stash. ![]() But since the stash is largish, I cannot see the particular change I want when I select the stash in SourceTree. Now I realize that one change in the stash would be good to include in the hotfix since I will anyway have to make a new deployment. I have stashed quite a bunch of changes that are not yet ready to be committed on the Develop branch in order to checkout the Master branch for a hotfix. Is there a way in SourceTree to see the whole content of a stash? ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |