blocks|key|421530|text|一般来说，您无法取回未提交的更改。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|421531|以前暂存的更改(git+add)应该可以从索引对象中恢复，因此，如果您这样做了，请使用git+fsck+--lost-found来定位与其相关的对象。(这会将对象写入.git/lost-found/目录；在那里，您可以使用git+show+<filename>查看每个文件的内容。)|offset|length|style|CODE|421532|如果不是，这里的答案是:看看你的备份。也许您的编辑器/集成开发环境将临时副本存储在/tmp或C:\TEMP下，诸如此类。1|BOLD|421533|git+reset+HEAD@{1}|code-block|syntax|javascript|421534|这将恢复到前一个磁头|421535|1+vim，例如，可选地存储永久撤消，eclipse+IDE存储本地历史记录；这样的功能可以节省您的|421536|entityMap^0|0|8|7|17|L|2B|G|33|J|0|J|J|0|0|0|2|3|J|7|0^^$0|@$1|2|3|4|5|6|7|V|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|W|8|@$D|X|E|Y|F|G]|$D|Z|E|10|F|G]|$D|11|E|12|F|G]|$D|13|E|14|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|15|8|@$D|16|E|17|F|J]]|9|@]|A|$]]|$1|K|3|L|5|M|7|18|8|@]|9|@]|A|$N|O]]|$1|P|3|Q|5|6|7|19|8|@]|9|@]|A|$]]|$1|R|3|S|5|6|7|1A|8|@$D|1B|E|1C|F|J]|$D|1D|E|1E|F|J]]|9|@]|A|$]]|$1|T|3|-4|5|6|7|1F|8|@]|9|@]|A|$]]]|U|$]]

You cannot get back uncommitted changes in general. 

Previously staged changes (<code>git add</code>) should be recoverable from index objects, so if you did, use <code>git fsck --lost-found</code> to locate the objects related to it. (This writes the objects to the <code>.git/lost-found/</code> directory; from there you can use <code>git show &lt;filename&gt;</code> to see the contents of each file.)

If not, the answer here would be: look at your backup. Perhaps your editor/IDE stores temp copies under /tmp or C:\TEMP and things like that.[1]

<pre><code>git reset HEAD@{1}
</code></pre>

This will restore to the previous HEAD

[1] vim e.g. optionally stores persistent undo, eclipse IDE stores local history; such features might save your a**

blocks|key|2041505|text|我今天也意外地在我的存储库上运行了git+reset+--hard，而今天也有未提交的更改。为了取回它，我运行了git+fsck+--lost-found，它将所有未引用的blob写入<path+to+repo>/.git/lost-found/。因为这些文件是未提交的，所以我在<path+to+repo>/.git/lost-found/的other目录中找到了它们。在那里，我可以使用git+show+<filename>查看未提交的文件，复制blobs并重命名它们。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2041506|注意:仅当您添加了要保存到索引的文件(使用git+add+.)时，这才有效。如果这些文件不在索引中，它们就会丢失。|2041507|entityMap^0|H|G|1K|L|2K|V|3W|V|4S|5|5F|J|0|L|9|0^^$0|@$1|2|3|4|5|6|7|J|8|@$9|K|A|L|B|C]|$9|M|A|N|B|C]|$9|O|A|P|B|C]|$9|Q|A|R|B|C]|$9|S|A|T|B|C]|$9|U|A|V|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|W|8|@$9|X|A|Y|B|C]]|D|@]|E|$]]|$1|H|3|-4|5|6|7|Z|8|@]|D|@]|E|$]]]|I|$]]

I accidentally ran <code>git reset --hard</code> on my repo today too while having uncommitted changes too today. To get it back, I ran <code>git fsck --lost-found</code>, which wrote all unreferenced blobs to <code>&lt;path to repo&gt;/.git/lost-found/</code>. Since the files were uncommitted, I found them in the <code>other</code> directory within the <code>&lt;path to repo&gt;/.git/lost-found/</code>. From there, I can see the uncommitted files using <code>git show &lt;filename&gt;</code>, copy out the blobs, and rename them.

Note: This only works if you added the files you want to save to the index (using <code>git add .</code>). If the files weren't in the index, they are lost.

blocks|key|2366964|text|我刚做了git+reset+--hard，丢失了所有未提交的更改。幸运的是，我使用了编辑器(IntelliJ)，并且能够从本地历史记录中恢复更改。Eclipse应该允许您做同样的事情。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2366965|entityMap^0|4|G|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|K|8|@]|D|@]|E|$]]]|G|$]]

I just did <code>git reset --hard</code> and lost all my uncommitted changes. Luckily, I use an editor (IntelliJ) and I was able to recover the changes from the Local History. Eclipse should allow you to do the same.

blocks|key|4115192|text|来自此SO的应答|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|4115193|$+git+reflog+show

4b6cf8e+(HEAD+->+master,+origin/master,+origin/HEAD)+HEAD@{0}:+reset:+moving+to+origin/master
295f07d+HEAD@{1}:+pull:+Merge+made+by+the+'recursive'+strategy.
7c49ec7+HEAD@{2}:+commit:+restore+dependencies+to+the+User+model
fa57f59+HEAD@{3}:+commit:+restore+dependencies+to+the+Profile+model
3431936+HEAD@{4}:+commit+(amend):+restore+admin
033f5c0+HEAD@{5}:+commit:+restore+admin
ecd2c1d+HEAD@{6}:+commit:+re-enable+settings+app

#+assuming+you+want+to+get+back+to+7c49ec7+(restore+dependencies+to+the+User+model)

$+git+reset+HEAD@{2}|code-block|syntax|javascript|4115194|你找回了属于你的一天！:)|4115195|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/questions/19898557/how-to-recover-last-commit-after-git-hard-reset^0|3|2|0|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@$A|T|B|U|1|V]]|C|$]]|$1|D|3|E|5|F|7|W|8|@]|9|@]|C|$G|H]]|$1|I|3|J|5|6|7|X|8|@]|9|@]|C|$]]|$1|K|3|-4|5|6|7|Y|8|@]|9|@]|C|$]]]|L|$M|$5|N|O|P|C|$Q|R]]]]

answer from this <a href="https://stackoverflow.com/questions/19898557/how-to-recover-last-commit-after-git-hard-reset">SO</a>
<pre><code>$ git reflog show

4b6cf8e (HEAD -&gt; master, origin/master, origin/HEAD) HEAD@{0}: reset: moving to origin/master
295f07d HEAD@{1}: pull: Merge made by the 'recursive' strategy.
7c49ec7 HEAD@{2}: commit: restore dependencies to the User model
fa57f59 HEAD@{3}: commit: restore dependencies to the Profile model
3431936 HEAD@{4}: commit (amend): restore admin
033f5c0 HEAD@{5}: commit: restore admin
ecd2c1d HEAD@{6}: commit: re-enable settings app

# assuming you want to get back to 7c49ec7 (restore dependencies to the User model)

$ git reset HEAD@{2}
</code></pre>
You got your day back! :)

blocks|key|421667|text|信息丢失。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|421668|因为您没有提交，所以您的.git从未存储过此信息。所以，基本上git不能为你恢复它。|offset|length|style|CODE|421669|但是，如果您刚刚执行了git+diff，有一种方法可以通过以下3个简单步骤使用终端输出进行恢复。|421670|421671|滚动您的终端并查找git+diff的o/p。将o/p保存在名为diff.patch|ordered-list-item|421672|Search的文件中，将所有7个空格和8个空格替换为制表符(\t)并保存更改。|421673|进入您的git存储库。应用(patch+-p1+<+diff.patch)|421674|+diff.patch|421675|注意:当您将数据从终端复制到文件时，请小心并清楚地看到数据是连续输出的，并且不包含任何冗余数据(由于按上下箭头)。否则你可能会把事情搞砸。|421676|entityMap^0|0|V|3|0|B|8|0|0|9|8|0|0|E|M|0|0|0^^$0|@$1|2|3|4|5|6|7|X|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Y|8|@$D|Z|E|10|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|11|8|@$D|12|E|13|F|G]]|9|@]|A|$]]|$1|J|3|-4|5|6|7|14|8|@]|9|@]|A|$]]|$1|K|3|L|5|M|7|15|8|@$D|16|E|17|F|G]]|9|@]|A|$]]|$1|N|3|O|5|M|7|18|8|@]|9|@]|A|$]]|$1|P|3|Q|5|M|7|19|8|@$D|1A|E|1B|F|G]]|9|@]|A|$]]|$1|R|3|S|5|6|7|1C|8|@]|9|@]|A|$]]|$1|T|3|U|5|6|7|1D|8|@]|9|@]|A|$]]|$1|V|3|-4|5|6|7|1E|8|@]|9|@]|A|$]]]|W|$]]

The information is lost.
Since you did not commit, your .git never stored this information. So, basically <code>git</code> cannot recover it for you.
But, If you just did <code>git diff</code>, there is a way you can recover using the terminal output with the following 3 simple steps.
<ol>
<li>scroll your terminal and look for the o/p of <code>git diff</code>. Save the o/p in a file called diff.patch</li>
<li>Search &amp; Replace all 7 spaces and 8 spaces with tab(\t) character and save the changes.</li>
<li>Go into your git repository. Apply the diff.patch (<code>patch -p1 &lt; diff.patch</code>)</li>
</ol>
Note: While you are copying the data from terminal to a file, be careful and clearly see that the data is continuous output and did not contain any redundant data(due to pressing up and down arrows). Otherwise you might mess it up.

blocks|key|421709|text|如果你使用像IntelliJ这样的东西：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|421710|在上下文菜单上，选择本地历史记录，然后单击子菜单上的显示历史记录：|421711|421712|项目或文件夹的本地历史记录视图显示您在过去几天中完成的所有操作。在对话框下部的“操作”列中，选择要回滚的操作。..。执行此操作后，对话框的上半部分将显示已更改文件的树视图。如果要仅恢复已删除的文件，而不考虑此后所做的其他更改，则可以在树视图中选择文件Lost.txt，然后单击恢复按钮。|blockquote|421713|421714|421715|http://blog.jetbrains.com/idea/2008/01/using-local-history-to-restore-deleted-files/|offset|length|421716|这才把我从火堆里救出来！|421717|entityMap|0|LINK|mutability|MUTABLE|url^0|0|0|0|0|0|0|0|2C|0|0|0^^$0|@$1|2|3|4|5|6|7|W|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|X|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|Y|8|@]|9|@]|A|$]]|$1|E|3|F|5|G|7|Z|8|@]|9|@]|A|$]]|$1|H|3|-4|5|6|7|10|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|11|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|12|8|@]|9|@$L|13|M|14|1|15]]|A|$]]|$1|N|3|O|5|6|7|16|8|@]|9|@]|A|$]]|$1|P|3|-4|5|6|7|17|8|@]|9|@]|A|$]]]|Q|$R|$5|S|T|U|A|$V|K]]]]

If you use something like IntelliJ:

On the context menu, choose Local History, and click Show History on the submenu:

<blockquote>
 The local history view for a project or folder shows you everything
 that you have done during the last few days. In the Action column of
 the lower part of the dialog box, select the action you want to roll
 back. [...] So doing, the upper part of the dialog box shows the tree view of changed files. If you want to restore the deleted file only, regardless of the other changes that have been done since then, you can select the file Lost.txt in the tree view and click the Revert button.
</blockquote>

<a href="http://blog.jetbrains.com/idea/2008/01/using-local-history-to-restore-deleted-files/" rel="noreferrer">http://blog.jetbrains.com/idea/2008/01/using-local-history-to-restore-deleted-files/</a>

This just got my arse out the fire!

blocks|key|4115354|text|根据定义，git+reset+--hard将丢弃未提交的更改，而没有任何方法来恢复它们(您的备份系统可能会有所帮助，但不会有帮助)。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|4115355|实际上，很少有情况下git+reset+--hard是个好主意。在大多数情况下，有一个更安全的命令来做同样的事情：|4115356|4115357|如果您想丢弃未提交的更改，请使用git+stash。它将保留这些更改的备份，如果您运行git+gc，该备份将在一段时间后过期。如果你99.9%25确定你永远不需要这些修改，那么对于0.1%25的情况，git+stash仍然是你的朋友。如果你100%25确定，那么git+stash仍然是你的朋友，因为这100%25都有测量误差；-)。|unordered-list-item|4115358|如果你想移动你的HEAD和历史上当前分支的尖端，那么git+reset+--keep是你的朋友。它将执行与git+reset+--hard相同的操作，但不会放弃您在本地所做的更改。|4115359|如果您想同时执行这两项操作，则git+stash+&&+git+reset+--keep是您的朋友。|4115360|4115361|教你的手指不要使用git+reset+--hard，它总有一天会得到回报的。|4115362|entityMap^0|5|G|0|A|G|0|0|G|9|17|6|2O|9|3H|9|0|8|4|Q|G|1H|G|0|F|T|0|0|9|G|0^^$0|@$1|2|3|4|5|6|7|U|8|@$9|V|A|W|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|X|8|@$9|Y|A|Z|B|C]]|D|@]|E|$]]|$1|H|3|-4|5|6|7|10|8|@]|D|@]|E|$]]|$1|I|3|J|5|K|7|11|8|@$9|12|A|13|B|C]|$9|14|A|15|B|C]|$9|16|A|17|B|C]|$9|18|A|19|B|C]]|D|@]|E|$]]|$1|L|3|M|5|K|7|1A|8|@$9|1B|A|1C|B|C]|$9|1D|A|1E|B|C]|$9|1F|A|1G|B|C]]|D|@]|E|$]]|$1|N|3|O|5|K|7|1H|8|@$9|1I|A|1J|B|C]]|D|@]|E|$]]|$1|P|3|-4|5|6|7|1K|8|@]|D|@]|E|$]]|$1|Q|3|R|5|6|7|1L|8|@$9|1M|A|1N|B|C]]|D|@]|E|$]]|$1|S|3|-4|5|6|7|1O|8|@]|D|@]|E|$]]]|T|$]]

By definition, <code>git reset --hard</code> will throw away uncommitted changes without any way for Git to recover them (your backup system may help, but not Git).

Actually, there are very few cases where <code>git reset --hard</code> is a good idea. In most cases, there's a safer command to do the same thing:

<ul>
<li>If you want to throw away your uncommitted changes, then use <code>git stash</code>. It will keep a backup of these changes, which will expire after some time if you run <code>git gc</code>. If you're 99.9% sure you'll never need these changes back, then <code>git stash</code> is still your friend for the 0.1% case. If you're 100% sure, then <code>git stash</code> is still your friend because these 100% have a measurement error ;-).</li>
<li>If you want to move your <code>HEAD</code> and the tip of the current branch in history, then <code>git reset --keep</code> is your friend. It will do the same thing as <code>git reset --hard</code>, but will not discard your local changes.</li>
<li>If you want to do both, then <code>git stash &amp;&amp; git reset --keep</code> is your friend.</li>
</ul>

Teach your fingers not to use <code>git reset --hard</code>, it will pay back one day.

blocks|key|4115403|text|如果您幸运地在另一个编辑器上打开了相同的文件(例如，Sublime+Text)在这些文本上尝试ctrl-z。它救了我..。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|4115404|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

If you luckily had the same files opened on another editor (eg. Sublime Text) try a ctrl-z on those. It just saved me..

blocks|key|421870|text|当我在一个本地项目上工作时，我想把它移到GitHub上，然后创建一个新的存储库。当我试图用.gitignore将所有这些文件添加到新的存储库时，我意外地添加了一个错误的文件，然后试图将其清除。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|421871|我运行了git+reset+--hard+origin/master|offset|length|style|CODE|421872|然后我所有的本地文件都被删除了，因为repo是空的。我还以为什么都没了呢。|421873|这对我很有效：|421874|git+reflog+show
git+reset+HEAD@{1}+
git+push+|code-block|syntax|javascript|421875|entityMap^0|0|4|U|0|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|T|8|@$D|U|E|V|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|W|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|X|8|@]|9|@]|A|$]]|$1|L|3|M|5|N|7|Y|8|@]|9|@]|A|$O|P]]|$1|Q|3|-4|5|6|7|Z|8|@]|9|@]|A|$]]]|R|$]]

While I was working on a local project, I wanted to move it to GitHub and then created a new repository. While I was trying to add all these files to the new repository with .gitignore, I accidentally added a wrong file and then tried to clear it.
I ran <code>git reset --hard origin/master</code>
Then all of my local files deleted because the repo was empty. I thought everything was gone.
This worked for me:
<pre><code>git reflog show
git reset HEAD@{1} 
git push 
</code></pre>

blocks|key|4115486|text|是的，您可以在git中从硬重置的恢复。|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|4115487|使用：|4115488|git+reflog|code-block|syntax|javascript|4115489|来获取提交的标识符。然后使用：|4115490|git+reset+--hard+<commit-id-retrieved-using-reflog>|4115491|这个小把戏救了我几次命。|4115492|你可以找到reflog+HERE的文档。|4115493|entityMap|0|LINK|mutability|MUTABLE|url|https://git-scm.com/docs/git-reflog^0|0|G|0|0|0|0|0|0|C|4|0|0^^$0|@$1|2|3|4|5|6|7|12|8|@$9|13|A|14|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|15|8|@]|D|@]|E|$]]|$1|H|3|I|5|J|7|16|8|@]|D|@]|E|$K|L]]|$1|M|3|N|5|6|7|17|8|@]|D|@]|E|$]]|$1|O|3|P|5|J|7|18|8|@]|D|@]|E|$K|L]]|$1|Q|3|R|5|6|7|19|8|@]|D|@]|E|$]]|$1|S|3|T|5|6|7|1A|8|@]|D|@$9|1B|A|1C|1|1D]]|E|$]]|$1|U|3|-4|5|6|7|1E|8|@]|D|@]|E|$]]]|V|$W|$5|X|Y|Z|E|$10|11]]]]

Yes, YOU CAN RECOVER from a hard reset in git.

Use:

<pre><code>git reflog
</code></pre>

to get the identifier of your commit.
Then use:

<pre><code>git reset --hard &lt;commit-id-retrieved-using-reflog&gt;
</code></pre>

This trick saved my life a couple of times.

You can find the documentation of reflog <a href="https://git-scm.com/docs/git-reflog" rel="noreferrer">HERE</a>.

blocks|key|2041835|text|如果我丢失了一些更改，这是我通常会做的。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2041836|git+reflog
git+checkout+<commit+id>+//+now+you+are+in+where+you+want+but+you+cannot+push+from+detached+branch+to+master
manually+copy+and+paste+changes+from+detached+branch+to+master+or+working+branch
git+reset+--hard+HEAD+//+if+needed
git+add+...+>+git+commit+...+>+git+push+...|code-block|syntax|javascript|2041837|将指针移回以前的提交，但保留您在最新提交签出git+reset+--soft+dadada中所做的更改|offset|length|style|CODE|2041838|entityMap^0|0|0|M|N|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Q|8|@$I|R|J|S|K|L]]|9|@]|A|$]]|$1|M|3|-4|5|6|7|T|8|@]|9|@]|A|$]]]|N|$]]

This is what I usually do if I lose some changes. 

<pre><code>git reflog
git checkout &lt;commit id&gt; // now you are in where you want but you cannot push from detached branch to master
manually copy and paste changes from detached branch to master or working branch
git reset --hard HEAD // if needed
git add ... &gt; git commit ... &gt; git push ...
</code></pre>

to move the pointer back to your previous commits but keeping the changes you made so far in your latest commits checkout <code>git reset --soft dadada</code>

blocks|key|421983|text|我艰难地发现，在git+reset+--hard+<commit>从git历史中删除之前，任何未提交的文件都会被删除。然而，幸运的是，在我努力工作的整个过程中，我的代码编辑器会话一直是打开的，我发现每个受影响的文件中的一个简单的control+%2B+z都会将文件的状态返回到Git之前的版本，所以我很乐意地重置了我没有特别要求的所有内容。Hooray!!|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|421984|entityMap^0|8|P|36|B|4O|8|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]|$9|K|A|L|B|C]|$9|M|A|N|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|O|8|@]|D|@]|E|$]]]|G|$]]

I found out the hard way that any uncommitted files before a <code>git reset --hard &lt;commit&gt;</code> gets removed from git history. However, I was lucky enough to have kept my code editor session open during the entire time I was pulling my hair out, that I discovered that a simple <code>control + z</code> in each of the affected files returned the state of the file back to the version before Git so obligingly reset everything I didn't ask it to specifically. <code>Hooray!!</code>

blocks|key|422001|text|如果您在Netbeans上进行开发，请查看文件标签和文件编辑区域。有一个“来源”和“历史”。在"History“上，你会看到使用版本控制(git/other)所做的更改，也可以看到本地所做的更改。在这种情况下，本地更改可以节省您的时间。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|422002|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

If you're developing on Netbeans, look between the file tabs and the file edit area. There is a "Source" and "History". On "History" you'll see changes made using version control (git/other), but also changes made locally. In this case, local changes could save you.

blocks|key|2041926|text|我遇到了同样的问题，我几乎要去insane....initially，我提交了项目并合并。后来，当我尝试运行git+push+--set-upstream+origin+master时，我得到了这个错误|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2041927|2041928|致命:拒绝合并不相关的历史记录|blockquote|2041929|2041930|2041931|所以我运行了git+reset+--hard+HEAD，它删除了一个3周的项目，但下面这几个命令拯救了我：|2041932|git+reset+HEAD@{1}+++++++++//this+command+unstage+changes+after+reset
git+fsck+--lost-found++++++//I+got+the+dangling+commit+fc3b6bee2bca5d8a7e16b6adaca6a76e620eca4b
git+show+<dangling+commit+something+like->+fc3b6bee2bca5d8a7e16b6adaca6a76e620eca4b>
git+rebase+fc3b6bee2bca5d8a7e16b6adaca6a76e620eca4b|code-block|syntax|javascript|2041933|entityMap^0|1I|11|0|0|0|0|0|6|L|0|0^^$0|@$1|2|3|4|5|6|7|U|8|@$9|V|A|W|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|X|8|@]|D|@]|E|$]]|$1|G|3|H|5|I|7|Y|8|@]|D|@]|E|$]]|$1|J|3|-4|5|6|7|Z|8|@]|D|@]|E|$]]|$1|K|3|-4|5|6|7|10|8|@]|D|@]|E|$]]|$1|L|3|M|5|6|7|11|8|@$9|12|A|13|B|C]]|D|@]|E|$]]|$1|N|3|O|5|P|7|14|8|@]|D|@]|E|$Q|R]]|$1|S|3|-4|5|6|7|15|8|@]|D|@]|E|$]]]|T|$]]

I ran into same issue and I was almost going insane....initially I committed the project and merged.
Later when I try running <code>git push --set-upstream origin master</code> I was getting this error
<blockquote>
<pre><code> fatal: refusing to merge unrelated histories
</code></pre>
</blockquote>
so I ran <code>git reset --hard HEAD</code> and it deleted a 3 weeks project but these few commands below save the day:
<pre><code>git reset HEAD@{1} //this command unstage changes after reset
git fsck --lost-found //I got the dangling commit fc3b6bee2bca5d8a7e16b6adaca6a76e620eca4b
git show &lt;dangling commit something like-&gt; fc3b6bee2bca5d8a7e16b6adaca6a76e620eca4b&gt;
git rebase fc3b6bee2bca5d8a7e16b6adaca6a76e620eca4b
</code></pre>

blocks|key|422062|text|(答案适用于部分用户)|type|unstyled|depth|inlineStyleRanges|entityRanges|data|422063|如果你使用(任何最近的)+macOS，即使你不在你的时光机磁盘上，操作系统也会保存每小时一次的备份，称为local+snapshots。|offset|length|422064|进入Time+Machine并导航到您丢失的文件。然后，操作系统将询问您：|422065|The+location+to+which+you're+restoring+"file.ext"+already+contains+an
item+with+the+same+name.+Do+you+want+to+replace+it+with+the+one+you're
restoring?|code-block|syntax|javascript|422066|您应该能够找回丢失的文件。|422067|entityMap|0|LINK|mutability|MUTABLE|url|https://support.apple.com/en-ca/HT204015^0|0|1G|F|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|W|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|X|8|@]|9|@$D|Y|E|Z|1|10]]|A|$]]|$1|F|3|G|5|6|7|11|8|@]|9|@]|A|$]]|$1|H|3|I|5|J|7|12|8|@]|9|@]|A|$K|L]]|$1|M|3|N|5|6|7|13|8|@]|9|@]|A|$]]|$1|O|3|-4|5|6|7|14|8|@]|9|@]|A|$]]]|P|$Q|$5|R|S|T|A|$U|V]]]]

(answer suitable for a subset of users)

If you're on (any recent) macOS, and even if you're away from your Time Machine disk, the OS will have saved hourly backups, called
<a href="https://support.apple.com/en-ca/HT204015" rel="nofollow noreferrer">local snapshots</a>.

Enter Time Machine and navigate to the file you lost. The OS will then ask you:

<pre><code>The location to which you're restoring "file.ext" already contains an
item with the same name. Do you want to replace it with the one you're
restoring?
</code></pre>

You should be able to recover the file(s) you lost.

blocks|key|2378372|text|稍后，您可以使用带有ext:+GitLens+-+Git的VSCode，这样您就可以使用此扩展来逆转您的代码|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2378373|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

For later you can use VSCode with ext: GitLens - Git supercharged so you can reverse your code with this extensions

blocks|key|2378386|text|IntelliJ有一个可通过历史记录命令访问的临时文件夹：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2378387|2378388|在导航窗格中选择要还原文件的文件夹，然后双击Shift键并在弹出的输入框中键入|ordered-list-item|2378389|，然后按Enter|2378390|选择显示历史记录|2378391|现在您可以还原到所需的版本。|2378392|2378393|entityMap^0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|P|8|@]|9|@]|A|$]]|$1|C|3|D|5|E|7|Q|8|@]|9|@]|A|$]]|$1|F|3|G|5|E|7|R|8|@]|9|@]|A|$]]|$1|H|3|I|5|E|7|S|8|@]|9|@]|A|$]]|$1|J|3|K|5|E|7|T|8|@]|9|@]|A|$]]|$1|L|3|-4|5|6|7|U|8|@]|9|@]|A|$]]|$1|M|3|-4|5|6|7|V|8|@]|9|@]|A|$]]]|N|$]]

IntelliJ has a temporary folder accessible through the history command:
<ol>
<li>Select the folder to revert files from in your navigation pane</li>
<li>Double tap the Shift key (shift-shift)</li>
<li>In the input box that pops up type Local History and press Enter</li>
<li>Select Show History</li>
<li>Now you can revert to the version you need.</li>
</ol>

blocks|key|2367235|text|您只能恢复已丢失的暂存(git+add)更改。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2367236|您可以通过运行以下命令轻松恢复|2367237|步骤:1转到项目根目录，然后运行以下命令|BOLD|2367238|npx+git-recover|code-block|syntax|javascript|2367239|步骤:2输入恢复目录路径，如|2367240|/Users/apple/RecoveryDirectory|2367241|您将在RecoveryDirectory中获得丢失的文件|2367242|​|2367243|📷|atomic|2367244|2367245|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/2f34b3359efe1d23eed10ce48342b3cc.gif|imageAlt^0|C|7|0|0|0|4|0|0|0|4|0|0|0|K|0|0|0|1|0|0|0^^$0|@$1|2|3|4|5|6|7|1A|8|@$9|1B|A|1C|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|1D|8|@]|D|@]|E|$]]|$1|H|3|I|5|6|7|1E|8|@$9|1F|A|1G|B|J]]|D|@]|E|$]]|$1|K|3|L|5|M|7|1H|8|@]|D|@]|E|$N|O]]|$1|P|3|Q|5|6|7|1I|8|@$9|1J|A|1K|B|J]]|D|@]|E|$]]|$1|R|3|S|5|M|7|1L|8|@]|D|@]|E|$N|O]]|$1|T|3|U|5|6|7|1M|8|@$9|1N|A|1O|B|J]]|D|@]|E|$]]|$1|V|3|W|5|6|7|1P|8|@]|D|@]|E|$]]|$1|X|3|Y|5|Z|7|1Q|8|@]|D|@$9|1R|A|1S|1|1T]]|E|$]]|$1|10|3|W|5|6|7|1U|8|@]|D|@]|E|$]]|$1|11|3|-4|5|6|7|1V|8|@]|D|@]|E|$]]]|12|$13|$5|14|15|16|E|$17|18|19|-4]]]]

You can only recover staged (<code>git add</code>) changes that you have lost.
you can recover easily by running this command
step:1 Go to project root directory and then run this command
<pre class="lang-sh prettyprint-override"><code>npx git-recover
</code></pre>
step:2 enter recovery directory path like
<pre><code>/Users/apple/RecoveryDirectory
</code></pre>
you will get lost file in RecoveryDirectory
<a href="https://i.stack.imgur.com/K8bVI.gif" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/K8bVI.gif" alt="enter image description here" /></a>

Is there any way to recover uncommitted changes to the working directory from a <code>git reset --hard HEAD</code>?

Recover from git reset --hard?

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

有没有办法从git reset --hard HEAD恢复未提交的对工作目录的更改

问从git重置中恢复--难吗？
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问从git重置中恢复--难吗？EN