blocks|key|553233|text|移到子模块的目录中，然后执行git+reset+--hard命令，将所有修改过的文件重置为上次提交的状态。请注意，这将丢弃所有未提交的更改。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|553234|entityMap^0|E|G|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|$]]

Move into the submodule's directory, then do a <code>git reset --hard</code> to reset all modified files to their last committed state. Be aware that this will discard all non-committed changes.

blocks|key|553313|text|如果您希望对所有子模块执行此操作，而不必更改目录，则可以执行|type|unstyled|depth|inlineStyleRanges|entityRanges|data|553314|git+submodule+foreach+git+reset+--hard|code-block|syntax|javascript|553315|您还可以使用递归标志将其应用于所有子模块：|553316|git+submodule+foreach+--recursive+git+reset+--hard|553317|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|$]]

If you want to do this for all submodules, without having to change directories, you can perform
<pre class="lang-sh prettyprint-override"><code>git submodule foreach git reset --hard
</code></pre>
You can also use the recursive flag to apply to all submodules:
<pre class="lang-sh prettyprint-override"><code>git submodule foreach --recursive git reset --hard
</code></pre>

blocks|key|553411|text|对我来说，有|type|unstyled|depth|inlineStyleRanges|entityRanges|data|553412|git+reset+--hard|code-block|syntax|javascript|553413|只需将子模块重置为签出时的状态，而不需要对main的repo引用commit/state。我仍然会像OP说的那样有“修改过的内容”。因此，为了使子模块返回到正确的提交，我运行：|553414|git+submodule+update+--init|553415|然后，当我执行git+status时，子模块上的代码是干净的。|offset|length|style|CODE|553416|entityMap^0|0|0|0|0|7|A|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|T|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|U|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|V|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|W|8|@$M|X|N|Y|O|P]]|9|@]|A|$]]|$1|Q|3|-4|5|6|7|Z|8|@]|9|@]|A|$]]]|R|$]]

Well for me, having

<pre><code>git reset --hard
</code></pre>

just reset the submodule to the state where it checked out, not necessary to the main's repo referenced commit/state. I'll still have "modified contents" like OP said. So, in order to get the submodule back to the corrects commit, I run:

<pre><code>git submodule update --init
</code></pre>

Then when I do <code>git status</code>, it's clean on the submodule.

blocks|key|337093|text|按顺序执行4个步骤：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|337094|git+submodule+foreach+git+reset+--hard+HEAD
git+submodule+update
git+submodule+foreach+"git+checkout+master;+git+pull"
git+submodule+foreach+git+clean+-f|code-block|syntax|javascript|337095|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|$]]

do 4 steps sequential:

<pre><code>git submodule foreach git reset --hard HEAD
git submodule update
git submodule foreach "git checkout master; git pull"
git submodule foreach git clean -f
</code></pre>

blocks|key|337156|text|一种比之前所有答案更安全的方法：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|337157|git+submodule+deinit+-f+.
git+submodule+update+--init|code-block|syntax|javascript|337158|第一个命令完全“解除”所有子模块的绑定，第二个命令则对它们进行新的签出。|337159|它比其他方法需要更长的时间，但无论你的子模块处于什么状态，它都可以工作。|337160|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|6|7|P|8|@]|9|@]|A|$]]|$1|K|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|L|$]]

A more fail-safe method than all previous answers:

<pre><code>git submodule deinit -f .
git submodule update --init
</code></pre>

The first command completely "unbinds" all submodules, the second then makes a fresh checkout of them. 
It takes longer than the other methods, but will work whatever the state of your submodules.

blocks|key|553607|text|对于git+<=+2.13，这两个命令组合在一起应该会用递归子模块重置您的repos：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|553608|git+submodule+foreach+--recursive+git+reset+--hard
git+submodule+update+--recursive+--init|code-block|syntax|javascript|553609|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 git &lt;= 2.13 these two commands combined should reset your repos with recursive submodules:

<pre><code>git submodule foreach --recursive git reset --hard
git submodule update --recursive --init
</code></pre>

blocks|key|337283|text|这对我很有效，包括递归到子模块中(也许这就是您的-f不工作的原因，因为您在子模块中更改子模块)：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|337284|git+submodule+update+-f+--recursive|code-block|syntax|javascript|337285|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|$]]

This worked for me, including recursively into submodules (perhaps that's why your -f didn't work, cause you changed a submodule inside the submodule):

<pre><code>git submodule update -f --recursive
</code></pre>

blocks|key|337326|text|先试试这个，就像其他人说的那样：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|337327|git+submodule+update+--init|code-block|syntax|javascript|337328|如果这不起作用，请切换到子模块目录并使用以下命令查看子模块是否有任何更改：|337329|git+status|337330|如果你的子模块有变化，去掉它们。确认你在运行"git+status“时看不到任何变化。|337331|接下来，返回到主存储库并再次运行"git+submodule+update+--init“。|337332|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|D|7|R|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|S|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|T|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|U|8|@]|9|@]|A|$]]|$1|M|3|N|5|6|7|V|8|@]|9|@]|A|$]]|$1|O|3|-4|5|6|7|W|8|@]|9|@]|A|$]]]|P|$]]

First try this, as others have said:

<pre><code>git submodule update --init
</code></pre>

If that doesn't work, change to the submodule directory and use the following command to see if there are any changes to the submodule:

<pre><code>git status
</code></pre>

If there are changes to your submodule, get rid of them. Verify that you can don't see any changes when you run "git status".

Next, go back to the main repository and run "git submodule update --init" again.

blocks|key|553750|text|如果您想要丢弃整个存储库和子模块中的所有更改，您可以使用：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|553751|git+restore+.+--recurse-submodules|code-block|syntax|javascript|553752|这将撤消在存储库和子模块中所做的所有更改。|553753|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 you want to discard all changes in the entire repository along with submodules, you can use:
<pre class="lang-sh prettyprint-override"><code>git restore . --recurse-submodules
</code></pre>
This will undo all changes made in repository and in sub modules.

blocks|key|337426|text|如果您的子模块中有更改，则使用|type|unstyled|depth|inlineStyleRanges|entityRanges|data|337427|git+submodule+foreach+--recursive+git+reset+--hard|code-block|syntax|javascript|337428|如果您的更改是远程子模块更改，则使用|337429|git+submodule+update+--init|337430|如果这些更改已提交，则使用|337431|git+reset+--hard
git+submodule+update+--init|337432|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|D|7|R|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|S|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|T|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|U|8|@]|9|@]|A|$]]|$1|M|3|N|5|D|7|V|8|@]|9|@]|A|$E|F]]|$1|O|3|-4|5|6|7|W|8|@]|9|@]|A|$]]]|P|$]]

If there's changes in your submodules, then use
<pre><code>git submodule foreach --recursive git reset --hard
</code></pre>
If your changes are remote submodule changes, then use
<pre><code>git submodule update --init
</code></pre>
If these changes have been committed, then use
<pre><code>git reset --hard
git submodule update --init
</code></pre>

blocks|key|553820|text|它很简单：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|553821|cd+/path/to/submodule/root
git+submodule+update+-f+--init++.|code-block|syntax|javascript|553822|大多数答案都建议重置所有子模块，我认为这不是最好的方法，因为可能会有合法的更改。|553823|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|$]]

It is simple:
<pre><code>cd /path/to/submodule/root
git submodule update -f --init .
</code></pre>
Most answers are suggesting resetting all the submodule, which I think is not the best approach as there might be legit changes in them.

I have a git submodule (RestKit) which I have added to my repo.

I accidentally changed some files in there and I'd like to go back to the source version. In order to do that, I tried to run 

<pre><code>Mac:app-ios user$ git submodule update RestKit
</code></pre>

But as you can see here, this did not work as it is still "modified content":

<pre><code>Mac:app-ios user$ git status
...
# modified: RestKit (modified content)
</code></pre>

Even 

<pre><code>Mac:app-ios user$ git submodule update -f RestKit 
</code></pre>

doesn't revert locally modified files. 
How do I reset the content of that submodule?

How do I revert my changes to a git submodule?

我有一个git子模块(RestKit)，我已经将它添加到我的存储库中。我不小心更改了其中的一些文件，我想返回到源版本。为了做到这一点，我试着跑Mac:app-ios user$ git submodule update RestKit但正如你在这里看到的，这并不起作用，因为它仍然是“修改的内容”：Mac:app-ios...

问如何将我的更改恢复到git子模块？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何将我的更改恢复到git子模块？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何将我的更改恢复到git子模块？
EN