git（sourcetree）回到没有被推送的提交，并被意外“颠倒”(git (sourcetree) go back to commit that has not been pushed and was 'reversed' accidentally)

 我对git修改还是很陌生，可能只是失去了很多工作（但我希望有一种方法可以回来，这就是我在这里问的原因）。 
 
 我在OsX上使用SourceTree进行git修改。 我没有犯下相当长的一段时间，现在只是想进行大量的修改。 我选择在提交后立即推送。 当推送花了很长时间，我检查了我的文件夹，发现我意外地选择了一个不应该签入的大文件夹。所以我取消了推送（我收到了一个类似commit的消息，但推送不成功）。 
 
 所以，即使我中断了推送，我仍然在我的主分支中看到了这个提交。 我想撤销这个，所以我可以再次提交（这次没有构建文件夹）。 我右键点击提交，然后点击“反向提交...”选项。 但不是删除这个修订版本，而是添加了另一个名为'Revert'的修订版本，我想撤销这个修订版本''。 
 
 糟糕的是 - 现在我所有的本地变化似乎都消失了，而且我的文件从一个月前就处于状态。 
 
 因为提交（我取消了推送）仍在列表中，我想知道我能否以某种方式回到那里？ 是否有机会获得上个月我做出的本地更改？ 我确实备份了我的文件，但这也差不多有两周了。 
 
 这就是sourcetree目前的样子： 
 
 
 如你所见，先前成功的提交/推送是在5月20日。然后今天我尝试提交/推送新功能，但在推送过程中被中断。 然后我'反转'这个（中断）提交，它将我所有的本地文件从5月20日重置为状态。Sourcetree显示有2个推动（我假设是中断推动和推动'反向'承诺）。 
 
 有什么办法可以在今天投入使用之前回到当地的州吗？ 
 
 非常感谢 

I'm still quite new to git revisioning and maybe just lost plenty of work (but I hope there is a way to go back, that's why I'm asking here).
 
I use SourceTree on OsX for git revisioning. I didn't commit for quite a long while and now just wanted to commit plenty of changes. I selected to push immediately after the commit. When the push took very long, I checked my folder and noticed that I accidentally had selected a big build folder that should not be checked in. So I cancelled the push (I got a message something like commit was successful but push was not).
 
So, even though I interrupted the push, I still saw this commit in my master branch. I wanted to undo this, so I could commit again (this time without the build folder). I rightclicked on the commit and there was a 'Reverse commit...' option, which I clicked. But instead of removing this revision, it added another revision labeled 'Revert "Name of the commit i wanted to undo"'.
 
Bad thing is - now all my local changes seem to have gone and my files are on the state from one month ago.
 
since the commit (of which I cancelled the push) is still in the list, I wonder if I can somehow go back there? Is there any chance to get the local changes I made during last month back? I do have a backup of my files, but that's also almost two weeks old.
 
This is how sourcetree currently looks like:
 
 
as you can see, the previous successful commit/push i made was on may 20. Then today I tried to commit/push new features, but interrupted during pushing. Then i 'reversed' this (interrupted) commit, which aparently reset all my local files to the state from may 20. Sourcetree shows that there are 2 Pushs to make (which I assume are the interrupted push and the push for the 'reverse' commit).
 
Is there any way I can go back to my local state I had right before committing today?
 
Thank you so much

原文：https://stackoverflow.com/questions/17071895