blocks|key|879292|text|查看git+stash，将所有本地更改放到一个“存储文件”中，并恢复到最后一次提交。在这一点上，您可以应用您的隐藏更改，或放弃它们。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|879293|entityMap|0|LINK|mutability|MUTABLE|url|http://git-scm.com/docs/git-stash^0|2|9|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@$A|M|B|N|1|O]]|C|$]]|$1|D|3|-4|5|6|7|P|8|@]|9|@]|C|$]]]|E|$F|$5|G|H|I|C|$J|K]]]]

Look at <a href="http://git-scm.com/docs/git-stash">git stash</a> to put all of your local changes into a "stash file" and revert to the last commit. At that point, you can apply your stashed changes, or discard them.

blocks|key|879365|text|如果您使用的是Linux：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|879366|git+fetch
for+file+in+`git+diff+origin/master..HEAD+--name-only`;+do+rm+-f+"$file";+done
git+pull|code-block|syntax|javascript|879367|for循环将删除所有在本地存储库中更改的跟踪文件，因此git+pull将不会出现任何问题。|offset|length|style|CODE|879368|最好的事情是，只有被跟踪的文件将被repo中的文件覆盖，所有其他文件将保持不变。|879369|entityMap^0|0|0|R|8|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|@$I|T|J|U|K|L]]|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|$]]

If you are on Linux:

<pre><code>git fetch
for file in `git diff origin/master..HEAD --name-only`; do rm -f "$file"; done
git pull
</code></pre>

The for loop will delete all tracked files which are changed in the local repo, so <code>git pull</code> will work without any problems. 
The nicest thing about this is that only the tracked files will be overwritten by the files in the repo, all other files will be left untouched.

blocks|key|1094153|text|对我来说，以下方法很管用：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1094154|(1)首先获取所有更改：|1094155|$+git+fetch+--all|code-block|syntax|javascript|1094156|(2)然后重置主机：|1094157|$+git+reset+--hard+origin/master|1094158|(3)拉取/更新：|1094159|$+git+pull|1094160|entityMap^0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|T|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|U|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|V|8|@]|9|@]|A|$]]|$1|K|3|L|5|F|7|W|8|@]|9|@]|A|$G|H]]|$1|M|3|N|5|6|7|X|8|@]|9|@]|A|$]]|$1|O|3|P|5|F|7|Y|8|@]|9|@]|A|$G|H]]|$1|Q|3|-4|5|6|7|Z|8|@]|9|@]|A|$]]]|R|$]]

For me the following worked:
(1) First fetch all changes:
<pre><code>$ git fetch --all
</code></pre>
(2) Then reset the master:
<pre><code>$ git reset --hard origin/master
</code></pre>
(3) Pull/update:
<pre><code>$ git pull
</code></pre>

blocks|key|879504|text|这将获取当前分支，并尝试快进到master：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|879505|git+fetch+&&+git+merge+--ff-only+origin/master|code-block|syntax|javascript|879506|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 will fetch the current branch and attempt to do a fast forward to master:

<pre><code>git fetch &amp;&amp; git merge --ff-only origin/master
</code></pre>

blocks|key|879515|text|git+fetch+--all+&&+git+reset+--hard+origin/master|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|879516|unstyled|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|G|8|@]|9|@]|A|$B|C]]|$1|D|3|-4|5|E|7|H|8|@]|9|@]|A|$]]]|F|$]]

<pre><code>git fetch --all &amp;&amp; git reset --hard origin/master
</code></pre>

blocks|key|879574|text|您只需要一个与rm+-rf+local_repo+&&+git+clone+remote_url完全相同的命令，对吧？我也想要这个功能。我想知道为什么git不提供这样的命令(例如git+reclone或git+sync)，svn也不提供这样的命令(例如svn+recheckout或svn+sync)。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|879575|尝试执行以下命令：|879576|git+reset+--hard+origin/master
git+clean+-fxd
git+pull|code-block|syntax|javascript|879577|entityMap^0|7|15|2H|B|2T|8|3I|E|3X|8|0|0|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]|$9|V|A|W|B|C]|$9|X|A|Y|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|Z|8|@]|D|@]|E|$]]|$1|H|3|I|5|J|7|10|8|@]|D|@]|E|$K|L]]|$1|M|3|-4|5|6|7|11|8|@]|D|@]|E|$]]]|N|$]]

You just want a command which gives exactly the same result as <code>rm -rf local_repo &amp;&amp; git clone remote_url</code>, right? I also want this feature. I wonder why git does not provide such a command (such as <code>git reclone</code> or <code>git sync</code>), neither does svn provide such a command (such as <code>svn recheckout</code> or <code>svn sync</code>).

Try the following command:

<pre><code>git reset --hard origin/master
git clean -fxd
git pull
</code></pre>

blocks|key|879612|text|这对我很有效|type|unstyled|depth|inlineStyleRanges|entityRanges|data|879613|git+fetch+--all
git+reset+--hard+origin/master
git+pull+origin+master|code-block|syntax|javascript|879614|使用接受的答案，我会得到冲突错误|879615|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|$]]

this worked for me

<pre><code>git fetch --all
git reset --hard origin/master
git pull origin master
</code></pre>

with the accepted answer I get conflict errors

blocks|key|1094343|text|.gitignore|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1094344|“只要您最初没有将不需要的文件提交到任何分支，向.gitignore添加不需要的文件就会起作用。”|1094345|您还可以运行：|1094346|git+update-index+--assume-unchanged+filename|code-block|syntax|javascript|1094347|https://chamindac.blogspot.com/2017/07/ignoring-visual-studio-2017-created.html|offset|length|1094348|entityMap|0|LINK|mutability|MUTABLE|url^0|0|0|0|0|0|27|0|0^^$0|@$1|2|3|4|5|6|7|V|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|W|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|X|8|@]|9|@]|A|$]]|$1|F|3|G|5|H|7|Y|8|@]|9|@]|A|$I|J]]|$1|K|3|L|5|6|7|Z|8|@]|9|@$M|10|N|11|1|12]]|A|$]]|$1|O|3|-4|5|6|7|13|8|@]|9|@]|A|$]]]|P|$Q|$5|R|S|T|A|$U|L]]]]

.gitignore

"Adding unwanted files to .gitignore works as long as you have not initially committed them to any branch. "

Also you can run:

<pre><code>git update-index --assume-unchanged filename
</code></pre>

<a href="https://chamindac.blogspot.com/2017/07/ignoring-visual-studio-2017-created.html" rel="nofollow noreferrer">https://chamindac.blogspot.com/2017/07/ignoring-visual-studio-2017-created.html</a>

blocks|key|879669|text|我通常这样做：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|879670|git+checkout+.
git+pull|code-block|syntax|javascript|879671|在项目的根文件夹中。|879672|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|$]]

I usually do:

<pre><code>git checkout .
git pull
</code></pre>

In the project's root folder.

blocks|key|879710|text|要做到这一点，最简单的方法是：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|879711|git+pull+--rebase+--autostash|code-block|syntax|javascript|879712|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|$]]

shortest way to do it is:

<pre><code>git pull --rebase --autostash
</code></pre>

Is there a way to do a <code>git pull</code> that ignores any local file changes without blowing the directory away and having to perform a <code>git clone</code>?

How to `git pull` while ignoring local changes?

有没有一种方法可以忽略本地文件的任何更改，而不会破坏目录并执行git clone

问如何在忽略本地变化的同时` `git pull`？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何在忽略本地变化的同时` `git pull`？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何在忽略本地变化的同时` `git pull`？
EN