blocks|key|272266|text|您可以通过添加'--no-+commit‘选项来恢复提交，而无需创建新的提交。这会将所有恢复的文件保留在临时区域中。从那里，我会执行一个软重置，并添加我真正想要的更改。以下是工作流程示例：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|272267|git+revert+<sha-of-bad-commit>+--no-commit
git+reset+++//+This+gets+them+out+of+the+staging+area
<edit+bad+file+to+look+like+it+should,+if+necessary>
git+add+<bad-file>
git+checkout+.+//+This+wipes+all+the+undesired+reverts+still+hanging+around+in+the+working+copy
git+commit|code-block|syntax|javascript|272268|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|$]]

You can revert the commit without creating a new one by adding the '--no-commit' option. This leaves all the reverted files in the staging area. From there, I'd perform a soft reset and add in the changes I really wanted. For an example workflow:

<pre><code>git revert &lt;sha-of-bad-commit&gt; --no-commit
git reset // This gets them out of the staging area
&lt;edit bad file to look like it should, if necessary&gt;
git add &lt;bad-file&gt;
git checkout . // This wipes all the undesired reverts still hanging around in the working copy
git commit
</code></pre>

blocks|key|3187564|text|您可以使用git+checkout手动检出要还原的文件的旧的、好的内容。例如，如果您想要将my-important-file恢复到它在版本abc123中的版本，您可以这样做|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|3187565|git+checkout+abc123+--+my-important-file|code-block|syntax|javascript|3187566|现在，您有了my-important-file的旧内容，甚至可以根据需要编辑它们，并像往常一样提交，这将恢复他所做的更改。如果只有部分提交需要恢复，那么可以使用git+add+-p从要提交的补丁中只选择几个块。|3187567|entityMap^0|5|C|19|H|1X|6|0|0|6|H|28|A|0^^$0|@$1|2|3|4|5|6|7|O|8|@$9|P|A|Q|B|C]|$9|R|A|S|B|C]|$9|T|A|U|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|V|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|W|8|@$9|X|A|Y|B|C]|$9|Z|A|10|B|C]]|D|@]|E|$]]|$1|M|3|-4|5|6|7|11|8|@]|D|@]|E|$]]]|N|$]]

You can just manually check out the old, good contents of the files you want to revert using <code>git checkout</code>. For instance, if you want to revert <code>my-important-file</code> to the version it was in the version <code>abc123</code>, you can do

<pre><code>git checkout abc123 -- my-important-file
</code></pre>

Now you have the old contents of <code>my-important-file</code> back, and can even edit them if you feel like, and commit as usual to make a commit which will revert the changes that he made. If there are only some parts of his commit that you want to revert, use <code>git add -p</code> to select only a few hunks from the patch that you are committing.

blocks|key|272308|text|可以使用checkout命令以交互方式应用文件的旧版本。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|272309|例如，如果您知道要添加回的代码被删除的COMMIT，则可以运行以下命令：|272310|git+checkout+-p+COMMIT%5E+--+FILE_TO_REVERT|code-block|syntax|javascript|272311|Git将提示您重新添加当前版本的文件中缺少的块。您可以使用e创建更改的补丁，然后再将其应用回来。|272312|entityMap^0|4|8|0|J|6|0|0|T|1|0^^$0|@$1|2|3|4|5|6|7|Q|8|@$9|R|A|S|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|T|8|@$9|U|A|V|B|C]]|D|@]|E|$]]|$1|H|3|I|5|J|7|W|8|@]|D|@]|E|$K|L]]|$1|M|3|N|5|6|7|X|8|@$9|Y|A|Z|B|C]]|D|@]|E|$]]|$1|O|3|-4|5|6|7|10|8|@]|D|@]|E|$]]]|P|$]]

You can interactively apply old version of a file using the <code>checkout</code> command.

For example, if you know the <code>COMMIT</code> where the code to add back was removed, you can run the following command:

<pre><code>git checkout -p COMMIT^ -- FILE_TO_REVERT
</code></pre>

Git will prompt you to add back the hunks that are missing from the current version of the file. You can use <code>e</code> to create a patch of the change before applying it back.

blocks|key|275813|text|我在Git邮件列表上找到了这样做的方法：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|275814|git+show+<commit>+--+<path>+%7C+git+apply+--reverse|code-block|syntax|javascript|275815|来源：http://git.661346.n2.nabble.com/Revert-a-single-commit-in-a-single-file-td6064050.html#a6064406|offset|length|275816|变体|275817|如果补丁没有干净地应用，该命令将失败(不会导致任何更改)，但使用--3way时，您会得到冲突，然后可以手动解决这些冲突(在这种情况下，Casey's+answer可能更实用)：|style|CODE|275818|git+show+<commit>+--+<path>+%7C+git+apply+--reverse+--3way|275819|您还可以使用它来部分恢复多个提交，例如：|275820|git+log+-S<string>+--patch+%7C+git+apply+--reverse|275821|在任何提交中恢复更改与<string>匹配的文件。这正是我在我的用例中所需要的(一些单独的提交对不同的文件引入了类似的更改，以及以不相关的方式对其他文件进行的更改，我不想恢复这些更改)。|275822|如果您在~/.gitconfig中设置了diff.noprefix=true，则需要将-p0添加到git+apply命令中，例如|275823|git+show+<commit>+--+<path>+%7C+git+apply+-p0+--reverse|275824|entityMap|0|LINK|mutability|MUTABLE|url|http://git.661346.n2.nabble.com/Revert-a-single-commit-in-a-single-file-td6064050.html#a6064406|1|https://stackoverflow.com/a/17664248/470844^0|0|0|3|2N|0|0|0|W|6|1V|E|1|0|0|0|0|B|8|0|4|C|K|I|17|3|1D|9|0|0^^$0|@$1|2|3|4|5|6|7|1C|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|1D|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|1E|8|@]|9|@$I|1F|J|1G|1|1H]]|A|$]]|$1|K|3|L|5|6|7|1I|8|@]|9|@]|A|$]]|$1|M|3|N|5|6|7|1J|8|@$I|1K|J|1L|O|P]]|9|@$I|1M|J|1N|1|1O]]|A|$]]|$1|Q|3|R|5|D|7|1P|8|@]|9|@]|A|$E|F]]|$1|S|3|T|5|6|7|1Q|8|@]|9|@]|A|$]]|$1|U|3|V|5|D|7|1R|8|@]|9|@]|A|$E|F]]|$1|W|3|X|5|6|7|1S|8|@$I|1T|J|1U|O|P]]|9|@]|A|$]]|$1|Y|3|Z|5|6|7|1V|8|@$I|1W|J|1X|O|P]|$I|1Y|J|1Z|O|P]|$I|20|J|21|O|P]|$I|22|J|23|O|P]]|9|@]|A|$]]|$1|10|3|11|5|D|7|24|8|@]|9|@]|A|$E|F]]|$1|12|3|-4|5|6|7|25|8|@]|9|@]|A|$]]]|13|$14|$5|15|16|17|A|$18|19]]|1A|$5|15|16|17|A|$18|1B]]]]

I found a way to do this on the Git mailing list:

<pre><code>git show &lt;commit&gt; -- &lt;path&gt; | git apply --reverse
</code></pre>

Source: <a href="http://git.661346.n2.nabble.com/Revert-a-single-commit-in-a-single-file-td6064050.html#a6064406" rel="noreferrer">http://git.661346.n2.nabble.com/Revert-a-single-commit-in-a-single-file-td6064050.html#a6064406</a>

<h1>Variations</h1>

That command fails (causing no changes) if the patch does not apply cleanly, but with <code>--3way</code> you instead get conflicts which you can then resolve manually (in this case <a href="https://stackoverflow.com/a/17664248/470844">Casey's answer</a> might be more practical):

<pre><code>git show &lt;commit&gt; -- &lt;path&gt; | git apply --reverse --3way
</code></pre>

You can also use this to partially revert multiple commits, e.g.:

<pre><code>git log -S&lt;string&gt; --patch | git apply --reverse
</code></pre>

to revert files with changes matching <code>&lt;string&gt;</code> in any commit. This is exactly what I needed in my use case (a few separate commits introduced similar changes to different files, along with changes other files in unrelated ways that I did not want to revert).

If you have <code>diff.noprefix=true</code> set in your <code>~/.gitconfig</code> then you need to add <code>-p0</code> to the <code>git apply</code> command, e.g.

<pre><code>git show &lt;commit&gt; -- &lt;path&gt; | git apply -p0 --reverse
</code></pre>

Is it possible to revert only a single file or certain changes in a file in multi file commit?

Full story
I committed a bunch of files. A number of commits later someone who will remain nameless (JACK!!!) copied a file into his repository and committed several files, overwriting some of the changes I did. I want to revert the one file that got clobbered or better yet, go in and revert two changes in that file. This will have to be a separate revert commit since it was pulled and pushed.

Can I do a partial revert in GIT

在多个文件提交中，是否可以仅恢复单个文件或文件中的某些更改？Full story我提交了很多文件。一些提交后将保持匿名的人(JACK！)将一个文件复制到他的存储库，并提交了几个文件，覆盖了我所做的一些更改。我想还原一个被破坏的文件，或者更好的是，进入并还原该文件中的两个更改。这必须是一个单独的还原提交，因为它是被拉入和...

问我可以在GIT中执行部分还原吗？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问我可以在GIT中执行部分还原吗？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问我可以在GIT中执行部分还原吗？
EN