blocks|key|3115007|text|这两个问题都在git+status中得到了回答。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|3115008|要取消转储添加新文件，请使用git+rm+--cached+filename.ext|3115009|#+Changes+to+be+committed:
#+++(use+"git+rm+--cached+<file>..."+to+unstage)
#
#+++new+file:+++test|code-block|syntax|javascript|3115010|要取消阶段删除文件，请使用git+reset+HEAD+filename.ext|3115011|#+Changes+to+be+committed:
#+++(use+"git+reset+HEAD+<file>..."+to+unstage)
#
#+++deleted:++++test|3115012|另一方面，git+checkout+--从不取消升级，它只会丢弃未升级的更改。|3115013|entityMap^0|7|A|0|E|S|0|0|D|R|0|0|5|F|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|I|5|J|7|10|8|@]|D|@]|E|$K|L]]|$1|M|3|N|5|6|7|11|8|@$9|12|A|13|B|C]]|D|@]|E|$]]|$1|O|3|P|5|J|7|14|8|@]|D|@]|E|$K|L]]|$1|Q|3|R|5|6|7|15|8|@$9|16|A|17|B|C]]|D|@]|E|$]]|$1|S|3|-4|5|6|7|18|8|@]|D|@]|E|$]]]|T|$]]

Both questions are answered in <code>git status</code>.

To unstage adding a new file use <code>git rm --cached filename.ext</code>

<pre><code># Changes to be committed:
# (use "git rm --cached &lt;file&gt;..." to unstage)
#
# new file: test
</code></pre>

To unstage deleting a file use <code>git reset HEAD filename.ext</code>

<pre><code># Changes to be committed:
# (use "git reset HEAD &lt;file&gt;..." to unstage)
#
# deleted: test
</code></pre>

In the other hand, <code>git checkout --</code> never unstage, it just discards non-staged changes.

blocks|key|3115048|text|你的两个问题的答案是相关的。我将从第二个开始：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3115049|存放文件(通常使用git+add，不过也有一些其他命令隐式存放更改，如git+rm)之后，可以使用git+reset+--+<file>撤消更改。|offset|length|style|CODE|3115050|在您的示例中，必须使用git+rm删除该文件，这相当于使用rm删除该文件，然后暂存更改。如果你先用git+reset+--+<file>卸载它，然后你可以用git+checkout+--+<file>恢复它。|3115051|entityMap^0|0|9|7|Z|6|1D|J|0|B|6|T|2|1D|J|26|M|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|M|8|@$D|N|E|O|F|G]|$D|P|E|Q|F|G]|$D|R|E|S|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|T|8|@$D|U|E|V|F|G]|$D|W|E|X|F|G]|$D|Y|E|Z|F|G]|$D|10|E|11|F|G]]|9|@]|A|$]]|$1|J|3|-4|5|6|7|12|8|@]|9|@]|A|$]]]|K|$]]

The answers to your two questions are related. I'll start with the second:

Once you have staged a file (often with <code>git add</code>, though some other commands implicitly stage the changes as well, like <code>git rm</code>) you can back out that change with <code>git reset -- &lt;file&gt;</code>.

In your case you must have used <code>git rm</code> to remove the file, which is equivalent to simply removing it with <code>rm</code> and then staging that change. If you first unstage it with <code>git reset -- &lt;file&gt;</code> you can then recover it with <code>git checkout -- &lt;file&gt;</code>.

blocks|key|3115064|text|假设您想要撤消git+rm+<file>或rm+<file>的效果，然后是git+add+-A或类似的效果：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|3115065|#+this+restores+the+file+status+in+the+index
git+reset+--+<file>
#+then+check+out+a+copy+from+the+index
git+checkout+--+<file>|code-block|syntax|javascript|3115066|要撤消git+add+<file>，上面的第一行就足够了，假设您还没有提交。|3115067|entityMap^0|7|D|L|9|11|A|0|0|3|E|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]]|D|@]|E|$]]|$1|M|3|-4|5|6|7|Z|8|@]|D|@]|E|$]]]|N|$]]

Assuming you're wanting to undo the effects of <code>git rm &lt;file&gt;</code> or <code>rm &lt;file&gt;</code> followed by <code>git add -A</code> or something similar:

<pre><code># this restores the file status in the index
git reset -- &lt;file&gt;
# then check out a copy from the index
git checkout -- &lt;file&gt;
</code></pre>

To undo <code>git add &lt;file&gt;</code>, the first line above suffices, assuming you haven't committed yet.

blocks|key|2900943|text|如果已暂存并提交，则执行以下操作将重置该文件：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2900944|git+reset+COMMIT_HASH+file_path
git+checkout+COMMIT_HASH+file_path
git+add+file_path|code-block|syntax|javascript|2900945|这将适用于之前多次提交的删除。|2900946|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|$]]

If it has been staged and committed, then the following will reset the file:

<pre><code>git reset COMMIT_HASH file_path
git checkout COMMIT_HASH file_path
git add file_path
</code></pre>

This will work for a deletion that occurred several commits previous.

blocks|key|233408|text|从git+v2.23开始，您有另一个选择：|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|233409|git+restore+--staged+--+<file>|style|CODE|233410|entityMap|0|LINK|mutability|MUTABLE|url|https://github.blog/2019-08-16-highlights-from-git-2-23/^0|1|9|0|0|0|U|0^^$0|@$1|2|3|4|5|6|7|P|8|@]|9|@$A|Q|B|R|1|S]]|C|$]]|$1|D|3|E|5|6|7|T|8|@$A|U|B|V|F|G]]|9|@]|C|$]]|$1|H|3|-4|5|6|7|W|8|@]|9|@]|C|$]]]|I|$J|$5|K|L|M|C|$N|O]]]]

As of <a href="https://github.blog/2019-08-16-highlights-from-git-2-23/" rel="noreferrer">git v2.23</a>, you have another option: 

<code>git restore --staged -- &lt;file&gt;</code>

blocks|key|3115160|text|我尝试了上面的解决方案，但仍然有困难。我将其他文件与两个意外删除的文件放在一起。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3115161|要撤消这两个已删除的文件，我必须撤消所有文件：|3115162|git+reset+HEAD+.|code-block|syntax|javascript|3115163|在这一点上，我能够对已删除的项目进行签出：|3115164|git+checkout+--+WorkingFolder/FileName.ext|3115165|最后，我能够重新存放其余的文件，并继续我的提交。|3115166|entityMap^0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|R|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|S|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|T|8|@]|9|@]|A|$]]|$1|K|3|L|5|F|7|U|8|@]|9|@]|A|$G|H]]|$1|M|3|N|5|6|7|V|8|@]|9|@]|A|$]]|$1|O|3|-4|5|6|7|W|8|@]|9|@]|A|$]]]|P|$]]

I tried the above solutions and I was still having difficulties. I had other files staged with two files that were deleted accidentally.
To undo the two deleted files I had to unstage all of the files:
<pre><code>git reset HEAD .
</code></pre>
At that point I was able to do the checkout of the deleted items:
<pre><code>git checkout -- WorkingFolder/FileName.ext
</code></pre>
Finally I was able to restage the rest of the files and continue with my commit.

blocks|key|237230|text|从手册页，|type|unstyled|depth|inlineStyleRanges|entityRanges|data|237231|git-reset+-+Reset+current+HEAD+to+the+specified+state
git+reset+[-q]+[<tree-ish>]+[--]+<paths>...
In+the+first+and+second+form,+copy+entries+from+<tree-ish>+to+the+index.|code-block|syntax|javascript|237232|例如，当我们使用git+reset+HEAD~1时，它会将当前的HEAD重置为HEAD~1|offset|length|style|CODE|237233|所以当我们使用git+reset+'some-deleted-file-path'时|237234|git假设‘某些已删除文件路径’为某个提交点，并尝试将当前头重置到那里。|237235|最后以失败告终|237236|fatal:+ambiguous+argument+'some-deleted-file-path':+unknown+revision+or+path+not+in+the+working+tree.|237237|entityMap^0|0|0|8|G|0|7|Y|0|0|0|0^^$0|@$1|2|3|4|5|6|7|W|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|X|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Y|8|@$I|Z|J|10|K|L]]|9|@]|A|$]]|$1|M|3|N|5|6|7|11|8|@$I|12|J|13|K|L]]|9|@]|A|$]]|$1|O|3|P|5|6|7|14|8|@]|9|@]|A|$]]|$1|Q|3|R|5|6|7|15|8|@]|9|@]|A|$]]|$1|S|3|T|5|D|7|16|8|@]|9|@]|A|$E|F]]|$1|U|3|-4|5|6|7|17|8|@]|9|@]|A|$]]]|V|$]]

From manual page,
<pre><code>git-reset - Reset current HEAD to the specified state
git reset [-q] [&lt;tree-ish&gt;] [--] &lt;paths&gt;...
In the first and second form, copy entries from &lt;tree-ish&gt; to the index.
</code></pre>
for example, when we use <code>git reset HEAD~1</code>
it reset our current HEAD to HEAD~1
so when we use <code>git reset 'some-deleted-file-path'</code>
git assume 'some-deleted-file-path' as some commit point and try to reset out current HEAD to there.
And it ends up fail
<pre><code>fatal: ambiguous argument 'some-deleted-file-path': unknown revision or path not in the working tree.
</code></pre>

Usually, to discard changes to a file you would do:

<pre><code>git checkout -- &lt;file&gt;
</code></pre>

What if the change I want to discard is deleting the file? The above line would give an error:

<pre><code>error: pathspec '&lt;file&gt;' did not match any file(s) known to git.
</code></pre>

What command will restore that single file without undoing other changes?

bonus point: Also, what if the change I want to discard is adding a file? I would like to know how to unstage that change as well.

Unstage a deleted file in git

通常，要放弃对文件的更改，您将执行以下操作：git checkout -- <file>如果我想要放弃的更改是删除文件，该怎么办？上面的代码行会给出一个错误：error: pathspec '<file>' did not match any file(s) known to git.哪个命令可以在不撤消其他更改的情况...

问在git中卸载已删除的文件
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问在git中卸载已删除的文件EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问在git中卸载已删除的文件
EN