blocks|key|1371635|text|您可以执行git+checkout操作，并为其指定要撤消的部分的名称。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1371636|entityMap^0|5|C|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|$]]

you can do <code>git checkout</code> and give it name names of the parts you want to undo.

blocks|key|1156698|text|你可以这样做|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1156699|git+checkout+master+--+path/to/file|code-block|syntax|javascript|1156700|对于要重置的每个文件。|1156701|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

You could do

<pre><code>git checkout master -- path/to/file
</code></pre>

For each file you want to reset.

blocks|key|1156739|text|您可以使用git+checkout+-p，它允许您从工作副本和索引之间的差异中选择单个块进行还原。同样，git+add+-p允许您选择要添加到索引中的块，而git+reset+-p允许您从索引和HEAD之间的差异中选择单个块以退出索引。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1156740|$+git+checkout+-p+file/to/partially/revert
#+or+...
$+git+checkout+-p+.|code-block|syntax|javascript|1156741|如果您希望在恢复这些更改之前预先对git存储库进行快照以保留这些更改，我喜欢这样做：|1156742|$+git+stash;+git+stash+apply|1156743|如果你经常使用它，你可能想要给它起别名：|1156744|[alias]
++++checkpoint+=+!git+stash;+git+stash+apply|1156745|如果你使用一个好的编辑器模式或插件，还原单个块或行甚至更容易，因为-p有时使用起来有点笨拙，因为它可能支持直接选择要还原的行。我使用Magit，这是一种Emacs模式，对使用Git非常有帮助。在Magit中，您可以运行magit-status，找到要恢复的更改的差异，选择要恢复的行(或者，如果您希望一次恢复一块而不是一次一行，只需将光标放在您希望恢复的块上)，然后按k键恢复那些特定的行。如果您使用Emacs，我强烈推荐Magit。|1156746|entityMap|0|LINK|mutability|MUTABLE|url|http://git-scm.com/docs/git-checkout|1|http://www.kernel.org/pub/software/scm/git/docs/git-add.html|2|http://git-scm.com/docs/git-reset|3|http://zagadka.vm.bytemark.co.uk/magit/^0|5|F|1G|A|26|C|5|F|0|1G|A|1|26|C|2|0|0|0|0|0|0|X|2|31|C|54|1|1U|5|3|0^^$0|@$1|2|3|4|5|6|7|18|8|@$9|19|A|1A|B|C]|$9|1B|A|1C|B|C]|$9|1D|A|1E|B|C]]|D|@$9|1F|A|1G|1|1H]|$9|1I|A|1J|1|1K]|$9|1L|A|1M|1|1N]]|E|$]]|$1|F|3|G|5|H|7|1O|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|1P|8|@]|D|@]|E|$]]|$1|M|3|N|5|H|7|1Q|8|@]|D|@]|E|$I|J]]|$1|O|3|P|5|6|7|1R|8|@]|D|@]|E|$]]|$1|Q|3|R|5|H|7|1S|8|@]|D|@]|E|$I|J]]|$1|S|3|T|5|6|7|1T|8|@$9|1U|A|1V|B|C]|$9|1W|A|1X|B|C]|$9|1Y|A|1Z|B|C]]|D|@$9|20|A|21|1|22]]|E|$]]|$1|U|3|-4|5|6|7|23|8|@]|D|@]|E|$]]]|V|$W|$5|X|Y|Z|E|$10|11]]|12|$5|X|Y|Z|E|$10|13]]|14|$5|X|Y|Z|E|$10|15]]|16|$5|X|Y|Z|E|$10|17]]]]

You can use <a href="http://git-scm.com/docs/git-checkout" rel="noreferrer"><code>git checkout -p</code></a>, which lets you choose individual hunks from the diff between your working copy and index to revert. Likewise, <a href="http://www.kernel.org/pub/software/scm/git/docs/git-add.html" rel="noreferrer"><code>git add -p</code></a> allows you to choose hunks to add to the index, and <a href="http://git-scm.com/docs/git-reset" rel="noreferrer"><code>git reset -p</code></a> allows you to choose individual hunks from the diff between the index and HEAD to back out of the index.

<pre><code>$ git checkout -p file/to/partially/revert
# or ...
$ git checkout -p .
</code></pre>

If you wish to snapshot your git repository beforehand to preserve these changes before reverting them, I like to do:

<pre><code>$ git stash; git stash apply
</code></pre>

If you use that often, you might want to alias it:

<pre><code>[alias]
 checkpoint = !git stash; git stash apply
</code></pre>

Reverting individual hunks or lines can be even easier if you use a good editor mode or plugin, which may provide support for selecting lines directly to revert, as <code>-p</code> can be a bit clumsy to use sometimes. I use <a href="http://zagadka.vm.bytemark.co.uk/magit/" rel="noreferrer">Magit</a>, an Emacs mode that is very helpful for working with Git. In Magit, you can run <code>magit-status</code>, find the diffs for the changes that you want to revert, select the lines you wish to revert (or simply put the cursor on hunks you wish to revert if you want to revert a hunk at a time instead of a line at a time), and press <code>k</code> to revert those specific lines. I highly recommend Magit if you use Emacs.

blocks|key|1156758|text|当我运行'git+status‘时，它会说：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1156759|$+git+status
#+On+branch+fr/fr.002
#+Changed+but+not+updated:
#+++(use+"git+add+<file>..."+to+update+what+will+be+committed)
#+++(use+"git+checkout+--+<file>..."+to+discard+changes+in+working+directory)
#
#+++modified:+++makefile
#
no+changes+added+to+commit+(use+"git+add"+and/or+"git+commit+-a")
$|code-block|syntax|javascript|1156760|因此，要取消未暂存的编辑，它会告诉我运行：|1156761|git+checkout+--+makefile|1156762|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|N|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|O|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|K|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|L|$]]

When I run 'git status', it says:

<pre><code>$ git status
# On branch fr/fr.002
# Changed but not updated:
# (use "git add &lt;file&gt;..." to update what will be committed)
# (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
#
# modified: makefile
#
no changes added to commit (use "git add" and/or "git commit -a")
$
</code></pre>

So, to cancel the unstaged edits, it tells me to run:

<pre><code>git checkout -- makefile
</code></pre>

blocks|key|1371777|text|git+diff+>+patchfile|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|1371778|然后编辑补丁文件并删除不想撤消的部分，然后：|unstyled|1371779|patch+-R+<+patchfile|1371780|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$B|C]]|$1|D|3|E|5|F|7|L|8|@]|9|@]|A|$]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$B|C]]|$1|I|3|-4|5|F|7|N|8|@]|9|@]|A|$]]]|J|$]]

<pre><code>git diff &gt; patchfile
</code></pre>

Then edit the patchfile and remove the parts you don't want to undo, then:

<pre><code>patch -R &lt; patchfile
</code></pre>

blocks|key|1156832|text|Brian+Campbell's+answer使我的git+1.9.2.msysgit.0版本崩溃，原因不明，所以我的方法是暂存我想要保留的块，丢弃工作副本中的更改，然后取消暂存。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1156833|$+git+add+-p
+++...+select+the+hunks+to+keep
$+git+checkout+--+.
$+git+reset+HEAD+.|code-block|syntax|javascript|1156834|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/a/1981868^0|0|N|0|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@$A|R|B|S|1|T]]|C|$]]|$1|D|3|E|5|F|7|U|8|@]|9|@]|C|$G|H]]|$1|I|3|-4|5|6|7|V|8|@]|9|@]|C|$]]]|J|$K|$5|L|M|N|C|$O|P]]]]

<a href="https://stackoverflow.com/a/1981868">Brian Campbell's answer</a> crashes my git, version 1.9.2.msysgit.0, for reasons unknown, so my approach is to stage hunks I want to keep, discard changes in the working copy, then unstage.

<pre><code>$ git add -p
 ... select the hunks to keep
$ git checkout -- .
$ git reset HEAD .
</code></pre>

How do I undo parts of my unstaged changes in git but keep the rest as unstaged? The way I figured out is:

<pre><code>git commit --interactive
# Choose the parts I want to delete
# Commit the changes
git stash
git rebase -i master # (I am an ancestor of master)
# Delete the line of the most recent commit
git stash apply
</code></pre>

This works, but it would be nice if there were something like <code>git commit --interactive</code> only for reverting changes. Any better methods?

Undo part of unstaged changes in git

如何在git中撤消部分未暂存的更改，而将其余更改保留为未暂存？我想出来的方法是：git commit --interactive# Choose the parts I want to delete# Commit the changesgit stashgit rebase -i master # (I am an ...

问在git中撤消部分未暂存的更改
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问在git中撤消部分未暂存的更改EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问在git中撤消部分未暂存的更改
EN