blocks|key|807314|text|@Will，git+immersion是一个非常好和简单的git教程。它将向您展示如何在以下情况下撤消更改:未暂存、暂存和已提交。实验14-18|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|807315|entityMap|0|LINK|mutability|MUTABLE|url|http://gitimmersion.com/^0|6|D|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@$A|M|B|N|1|O]]|C|$]]|$1|D|3|-4|5|6|7|P|8|@]|9|@]|C|$]]]|E|$F|$5|G|H|I|C|$J|K]]]]

@Will, <a href="http://gitimmersion.com/">git immersion</a> is a really nice and simple git tutorial. it will show you how to undo changes for the following cases: unstaged, staged and committed. labs 14-18

blocks|key|1022076|text|git+diff+master+>+branch.diff
git+apply+--reverse+branch.diff|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|1022077|unstyled|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|G|8|@]|9|@]|A|$B|C]]|$1|D|3|-4|5|E|7|H|8|@]|9|@]|A|$]]]|F|$]]

<pre><code>git diff master &gt; branch.diff
git apply --reverse branch.diff
</code></pre>

blocks|key|1022098|text|在源根目录中：git+reset+./+HEAD++<--un-stage+any+staged+changes++git+checkout+./++++<--discard+any+unstaged+changes|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1022099|entityMap^0|7|2T|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|$]]

In the source root:
<code>
git reset ./ HEAD &lt;--un-stage any staged changes 
git checkout ./ &lt;--discard any unstaged changes</code>

blocks|key|1022207|text|当您想要放弃本地分支中的更改时，可以使用git+stash命令隐藏这些更改。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1022208|git+stash存储"some_name“|1022209|您的更改将被保存，如果需要，您可以在以后检索这些更改，也可以将其删除。这样做之后，您的分支将不会有任何未提交的代码，您可以使用git+pull从您的主分支提取最新的代码。|1022210|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|H|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|I|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|J|8|@]|9|@]|A|$]]|$1|F|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|G|$]]

When you want to discard changes in your local branch, you can stash these changes using git stash command.

git stash save "some_name"

Your changes will be saved and you can retrieve those later,if you want or you can delete it.
After doing this, your branch will not have any uncommitted code and you can pull the latest code from your main branch using git pull.

blocks|key|1022276|text|git+checkout+-f|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1022277|这对你的问题来说已经足够了。唯一的问题是，一旦完成，就完成了。不能撤消。|1022278|entityMap^0|0|F|0|0^^$0|@$1|2|3|4|5|6|7|J|8|@$9|K|A|L|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|M|8|@]|D|@]|E|$]]|$1|H|3|-4|5|6|7|N|8|@]|D|@]|E|$]]]|I|$]]

<code>git checkout -f</code>

This is suffice for your question. Only thing is, once its done, its done. There is no undo.

blocks|key|1022327|text|对于其他人，如果您只想恢复对单个文件的更改：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1022328|git+restore+<fileName>|code-block|syntax|javascript|1022329|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

For others, if you want to just revert changes on a single file:
<pre><code>git restore &lt;fileName&gt;
</code></pre>

blocks|key|807667|text|后面跟着git+clone+<repo>.git的rm+-rf+<working+dir>怎么样？|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|807668|在阅读了所有这些建议后，这正是我最终要做的，它完美地工作了！|807669|entityMap^0|4|K|P|K|0|0^^$0|@$1|2|3|4|5|6|7|J|8|@$9|K|A|L|B|C]|$9|M|A|N|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|O|8|@]|D|@]|E|$]]|$1|H|3|-4|5|6|7|P|8|@]|D|@]|E|$]]]|I|$]]

How about <code>rm -rf &lt;working dir&gt;</code> followed by <code>git clone &lt;repo&gt;.git</code>
After reading all these suggestions, its exactly what I ended up doing and it worked perfectly!

I'm working in a branch (i.e. <code>design</code>) and I've made a number of changes, but I need to discard them all and reset it to match the repository version. I thought <code>git checkout design</code> would do it, but it just tells me I'm already in branch <code>design</code> and that I have 3 modified files.

How would I discard those changes and get the branch as it stands now on the remote server?

How to discard all changes made to a branch?

服务器

我在一个分支(即design)中工作，我做了许多更改，但我需要将它们全部丢弃并重置以匹配存储库版本。我以为git checkout design会这么做，但它只是告诉我，我已经在分支design中，并且我有3个修改过的文件。我如何放弃这些更改并获得远程服务器上现在的分支？

问如何放弃对分支所做的所有更改？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何放弃对分支所做的所有更改？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何放弃对分支所做的所有更改？
EN