blocks|key|714866|text|如果你破坏了树但是没有提交代码，你可以使用git+reset，如果你只想恢复一个文件，你可以使用git+checkout。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|714867|如果您破坏了树并提交了代码，则可以使用git+revert+HEAD。|714868|http://book.git-scm.com/4_undoing_in_git_-_reset,_checkout_and_revert.html|714869|entityMap|0|LINK|mutability|MUTABLE|url^0|L|9|1C|C|0|J|F|0|0|22|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@$9|R|A|S|B|C]|$9|T|A|U|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|V|8|@$9|W|A|X|B|C]]|D|@]|E|$]]|$1|H|3|I|5|6|7|Y|8|@]|D|@$9|Z|A|10|1|11]]|E|$]]|$1|J|3|-4|5|6|7|12|8|@]|D|@]|E|$]]]|K|$L|$5|M|N|O|E|$P|I]]]]

<p>If you broke the tree but didn't commit the code, you can use <code>git reset</code>, and if you just want to restore one file, you can use <code>git checkout</code>. </p>

<p>If you broke the tree and committed the code, you can use <code>git revert HEAD</code>.</p>

<p><a href="http://book.git-scm.com/4_undoing_in_git_-_reset,_checkout_and_revert.html" rel="nofollow">http://book.git-scm.com/4_undoing_in_git_-_reset,_checkout_and_revert.html</a></p>


blocks|key|499389|text|这三个命令的目的完全不同。它们甚至一点也不相似。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|499390|git+revert|offset|length|style|CODE|499391|此命令创建一个新的commit，该commit撤消对先前commit所做的更改。此命令将新的历史记录添加到项目中(它不修改现有的历史记录)。|499392|git+checkout|499393|此命令从存储库中签出内容，并将其放入工作树中。它还可以有其他效果，具体取决于命令的调用方式。例如，它还可以更改您当前正在处理的分支。此命令不会对历史记录进行任何更改。|499394|git+reset|499395|这个命令有点复杂。它实际上做了几件不同的事情，这取决于它是如何调用的。它修改索引(所谓的“临时区域”)。或者它改变了一个分支头当前指向的提交。此命令可能会更改现有的历史记录(通过更改分支引用的提交)。|499396|使用这些命令|499397|如果在项目历史中的某个地方进行了提交，而您后来确定该提交是错误的，并且不应该进行提交，那么git+revert就是该工作的工具。它将撤消由错误提交引入的更改，并在历史记录中记录“撤消”。|499398|如果您已经修改了工作树中的文件，但尚未提交更改，那么您可以使用git+checkout签出该文件的一个新的存储库副本。|499399|如果您已经提交了一个提交，但没有与其他任何人共享它，并且您决定不想要它，那么您可以使用git+reset重写历史，这样看起来就像您从未提交过它一样。|499400|这些只是一些可能的使用场景。在某些情况下，还可以使用其他命令，上述三个命令也有其他用途。|499401|entityMap^0|0|0|A|0|0|0|C|0|0|0|9|0|0|0|19|A|0|V|C|0|17|9|0|0^^$0|@$1|2|3|4|5|6|7|13|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|14|8|@$D|15|E|16|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|17|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|18|8|@$D|19|E|1A|F|G]]|9|@]|A|$]]|$1|L|3|M|5|6|7|1B|8|@]|9|@]|A|$]]|$1|N|3|O|5|6|7|1C|8|@$D|1D|E|1E|F|G]]|9|@]|A|$]]|$1|P|3|Q|5|6|7|1F|8|@]|9|@]|A|$]]|$1|R|3|S|5|6|7|1G|8|@]|9|@]|A|$]]|$1|T|3|U|5|6|7|1H|8|@$D|1I|E|1J|F|G]]|9|@]|A|$]]|$1|V|3|W|5|6|7|1K|8|@$D|1L|E|1M|F|G]]|9|@]|A|$]]|$1|X|3|Y|5|6|7|1N|8|@$D|1O|E|1P|F|G]]|9|@]|A|$]]|$1|Z|3|10|5|6|7|1Q|8|@]|9|@]|A|$]]|$1|11|3|-4|5|6|7|1R|8|@]|9|@]|A|$]]]|12|$]]

<p>These three commands have entirely different purposes. They are not even remotely similar.</p>

<h2><code>git revert</code></h2>

<p>This command creates a new commit that undoes the changes from a previous commit. This command adds new history to the project (it doesn't modify existing history).</p>

<h2><code>git checkout</code></h2>

<p>This command checks-out content from the repository and puts it in your work tree. It can also have other effects, depending on how the command was invoked. For instance, it can also change which branch you are currently working on. This command doesn't make any changes to the history.</p>

<h2><code>git reset</code></h2>

<p>This command is a little more complicated. It actually does a couple of different things depending on how it is invoked. It modifies the index (the so-called "staging area"). Or it changes which commit a branch head is currently pointing at. This command may alter existing history (by changing the commit that a branch references).</p>

<h2>Using these commands</h2>

<p>If a commit has been made somewhere in the project's history, and you later decide that the commit is wrong and should not have been done, then <code>git revert</code> is the tool for the job. It will undo the changes introduced by the bad commit, recording the "undo" in the history.</p>

<p>If you have modified a file in your working tree, but haven't committed the change, then you can use <code>git checkout</code> to checkout a fresh-from-repository copy of the file.</p>

<p>If you have made a commit, but haven't shared it with anyone else and you decide you don't want it, then you can use <code>git reset</code> to rewrite the history so that it looks as though you never made that commit.</p>

<p>These are just some of the possible usage scenarios. There are other commands that can be useful in some situations, and the above three commands have other uses as well.</p>


blocks|key|499464|text|假设你有提交：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|499465|C
B
A|code-block|syntax|javascript|499466|git+revert+B将创建一个撤消B中更改的提交。|offset|length|style|CODE|499467|git+revert+A，将创建一个撤消A中更改的提交，但不会触及B中的更改|499468|请注意，如果B中的更改依赖于A中的更改，则无法恢复A。|499469|git+reset+--soft+A将更改提交历史记录和存储库；暂存和工作目录仍将处于C状态。|499470|git+reset+--mixed+A将更改提交历史记录、存储库和暂存；工作目录仍将处于C状态。|499471|git+reset+--hard+A将更改提交历史记录、存储库、暂存和工作目录；您将完全返回到A的状态。|499472|entityMap^0|0|0|0|C|J|1|0|0|C|K|1|X|1|0|6|1|E|1|P|1|0|0|I|17|1|0|0|J|18|1|0|0|I|1B|1|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|Z|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|10|8|@$I|11|J|12|K|L]|$I|13|J|14|K|L]]|9|@]|A|$]]|$1|M|3|N|5|6|7|15|8|@$I|16|J|17|K|L]|$I|18|J|19|K|L]|$I|1A|J|1B|K|L]]|9|@]|A|$]]|$1|O|3|P|5|6|7|1C|8|@$I|1D|J|1E|K|L]|$I|1F|J|1G|K|L]|$I|1H|J|1I|K|L]]|9|@]|A|$]]|$1|Q|3|R|5|6|7|1J|8|@$I|1K|J|1L|K|L]|$I|1M|J|1N|K|L]]|9|@]|A|$]]|$1|S|3|T|5|6|7|1O|8|@$I|1P|J|1Q|K|L]|$I|1R|J|1S|K|L]]|9|@]|A|$]]|$1|U|3|V|5|6|7|1T|8|@$I|1U|J|1V|K|L]|$I|1W|J|1X|K|L]]|9|@]|A|$]]|$1|W|3|-4|5|6|7|1Y|8|@]|9|@]|A|$]]]|X|$]]

<p>Let's say you had commits:</p>

<pre><code>C
B
A
</code></pre>

<p><code>git revert B</code>, will create a commit that undoes changes in <code>B</code>.</p>

<p><code>git revert A</code>, will create a commit that undoes changes in <code>A</code>, but will not touch changes in <code>B</code></p>

<p>Note that if changes in <code>B</code> are dependent on changes in <code>A</code>, the revert of <code>A</code> is not possible.</p>

<p><code>git reset --soft A</code>, will change the commit history and repository; staging and working directory will still be at state of <code>C</code>.</p>

<p><code>git reset --mixed A</code>, will change the commit history, repository, and staging; working directory will still be at state of <code>C</code>.</p>

<p><code>git reset --hard A</code>, will change the commit history, repository, staging and working directory; you will go back to the state of <code>A</code> completely.</p>


<p>I am trying to learn how to restore or rollback files and projects to a prior state, and don't understand the difference between <code>git revert</code>, <code>checkout</code>, and <code>reset</code>.  Why are there 3 different commands for seemingly the same purpose, and when should someone choose one over the other?</p>


What's the difference between Git Revert, Checkout and Reset?

我正在尝试学习如何将文件和项目恢复或回滚到以前的状态，而不了解git revert、checkout和reset之间的区别。为什么有3个不同的命令似乎有相同的目的，什么时候应该选择一个而不是另一个？

问Git Revert，Checkout和Reset有什么区别？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Git Revert，Checkout和Reset有什么区别？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Git Revert，Checkout和Reset有什么区别？
EN