blocks|key|263879|text|git+rm+<file>|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|263880|http://git-scm.com/docs/git-rm|263881|还要将要忽略的文件/目录添加到.gitignore文件中。|263882|entityMap|0|LINK|mutability|MUTABLE|url^0|0|D|0|0|U|0|0|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|@]|D|@$9|U|A|V|1|W]]|E|$]]|$1|H|3|I|5|6|7|X|8|@]|D|@]|E|$]]|$1|J|3|-4|5|6|7|Y|8|@]|D|@]|E|$]]]|K|$L|$5|M|N|O|E|$P|G]]]]

<code>git rm &lt;file&gt;</code>

<a href="http://git-scm.com/docs/git-rm" rel="nofollow">http://git-scm.com/docs/git-rm</a>

Also add files/directories you want to ignore to your .gitignore file.

blocks|key|263925|text|您可以使用.gitignore忽略文件|type|unstyled|depth|inlineStyleRanges|entityRanges|data|263926|只需将*.orig放入如下所示的列表中|263927|https://help.github.com/articles/ignoring-files|offset|length|263928|要删除当前文件，您可以创建shell脚本并从项目文件夹中运行，如下所示|263929|for+file+in+`find+*.orig+-type+f+-print`
do
+++echo+"Deleting+file+$file"
+++git+rm+$file+-f+++++++
done|code-block|syntax|javascript|263930|entityMap|0|LINK|mutability|MUTABLE|url^0|0|0|0|1B|0|0|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|@$F|Y|G|Z|1|10]]|A|$]]|$1|H|3|I|5|6|7|11|8|@]|9|@]|A|$]]|$1|J|3|K|5|L|7|12|8|@]|9|@]|A|$M|N]]|$1|O|3|-4|5|6|7|13|8|@]|9|@]|A|$]]]|P|$Q|$5|R|S|T|A|$U|E]]]]

You can ignore files using .gitignore

Just put *.orig in the list like shown here

<a href="https://help.github.com/articles/ignoring-files" rel="noreferrer">https://help.github.com/articles/ignoring-files</a>

for deleting current files you can create shell script and run from project folder like below

<pre><code>for file in `find *.orig -type f -print`
do
 echo "Deleting file $file"
 git rm $file -f 
done
</code></pre>

blocks|key|263965|text|尝试git+clean更多信息，您可以在here或here上找到|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|263966|entityMap|0|LINK|mutability|MUTABLE|url|http://www.kernel.org/pub/software/scm/git/docs/git-clean.html|1|http://travisjeffery.com/b/2011/12/keeping-your-git-repo-clean-of-orig-files/^0|2|9|K|4|0|P|4|1|0^^$0|@$1|2|3|4|5|6|7|P|8|@$9|Q|A|R|B|C]]|D|@$9|S|A|T|1|U]|$9|V|A|W|1|X]]|E|$]]|$1|F|3|-4|5|6|7|Y|8|@]|D|@]|E|$]]]|G|$H|$5|I|J|K|E|$L|M]]|N|$5|I|J|K|E|$L|O]]]]

Try <code>git clean</code> more info you can find <a href="http://www.kernel.org/pub/software/scm/git/docs/git-clean.html" rel="noreferrer">here</a> or <a href="http://travisjeffery.com/b/2011/12/keeping-your-git-repo-clean-of-orig-files/" rel="noreferrer">here</a>

blocks|key|264000|text|git+rm+Gemfile.lock.orig和其他您不需要的文件。git+commit+--amend|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|264001|要完全删除这些blobs，请使用git+gc+--prune=0+--aggressive|264002|entityMap^0|0|O|Z|I|0|G|T|0^^$0|@$1|2|3|4|5|6|7|J|8|@$9|K|A|L|B|C]|$9|M|A|N|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|O|8|@$9|P|A|Q|B|C]]|D|@]|E|$]]|$1|H|3|-4|5|6|7|R|8|@]|D|@]|E|$]]]|I|$]]

<code>git rm Gemfile.lock.orig</code>
and the rest of the files you don't need.
<code>git commit --amend</code>

To completely remove those blobs,
<code>git gc --prune=0 --aggressive</code>

blocks|key|264058|text|在这种情况下，最好的解决方案是保持它的简单性，并摆脱那些独立于git的文件：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|264059|cd+/your/repo/directory
find+.+-name+'*.orig'+-delete+|code-block|syntax|javascript|264060|或者，在Windows/PowerShell中，您可以运行以下命令|264061|cd+\your\repo\directory
Get-ChildItem+-Recurse+-Filter+'*.orig'+%7C+Remove-Item|264062|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|$]]

Best solution in this case is to keep it simple and get rid of those files independently of git:

<pre><code>cd /your/repo/directory
find . -name '*.orig' -delete 
</code></pre>

Alternatively, in Windows/PowerShell, you can run the following command

<pre><code>cd \your\repo\directory
Get-ChildItem -Recurse -Filter '*.orig' | Remove-Item
</code></pre>

blocks|key|264101|text|您可以执行以下操作：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|264102|git+config+--global+mergetool.keepBackup+false|code-block|syntax|javascript|264103|有关详细信息，请参阅Git+mergetool+generates+unwanted+.orig+files|offset|length|264104|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/questions/1251681/git-mergetool-generates-unwanted-orig-files^0|0|0|A|18|0|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|@$I|V|J|W|1|X]]|A|$]]|$1|K|3|-4|5|6|7|Y|8|@]|9|@]|A|$]]]|L|$M|$5|N|O|P|A|$Q|R]]]]

you can do:

<pre><code>git config --global mergetool.keepBackup false
</code></pre>

For more info, refer to to <a href="https://stackoverflow.com/questions/1251681/git-mergetool-generates-unwanted-orig-files">Git mergetool generates unwanted .orig files</a>

blocks|key|481075|text|对我来说，git+clean+-f删除了所有的*.oig文件。并保留了之前已经存在的那些。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|481076|这是合并后(几乎)的样子：|481077|$+git+status
On+branch+feature/xyz
Your+branch+is+ahead+of+'origin/feature/xyz'+by+568+commits.
++(use+"git+push"+to+publish+your+local+commits)

Untracked+files:
++(use+"git+add+<file>..."+to+include+in+what+will+be+committed)

++++.idea/codeStyles/
++++.idea/misc.xml.orig|code-block|syntax|javascript|481078|在合并之前，.idea/codeStyles/已经作为一个未跟踪的文件存在了。.idea/misc.xml.orig+(以及更多)必须被移除。|481079|使用git+clean+-f的=>|481080|$+git+clean+-f
Removing+.idea/misc.xml.orig|481081|结果是：|481082|$+git+status
On+branch+feature/xyz
Your+branch+is+ahead+of+'origin/feature/xyz'+by+568+commits.
++(use+"git+push"+to+publish+your+local+commits)

Untracked+files:
++(use+"git+add+<file>..."+to+include+in+what+will+be+committed)

++++.idea/codeStyles/|481083|entityMap^0|5|C|0|0|0|6|H|13|J|0|2|C|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Y|8|@$9|Z|A|10|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|11|8|@]|D|@]|E|$]]|$1|H|3|I|5|J|7|12|8|@]|D|@]|E|$K|L]]|$1|M|3|N|5|6|7|13|8|@$9|14|A|15|B|C]|$9|16|A|17|B|C]]|D|@]|E|$]]|$1|O|3|P|5|6|7|18|8|@$9|19|A|1A|B|C]]|D|@]|E|$]]|$1|Q|3|R|5|J|7|1B|8|@]|D|@]|E|$K|L]]|$1|S|3|T|5|6|7|1C|8|@]|D|@]|E|$]]|$1|U|3|V|5|J|7|1D|8|@]|D|@]|E|$K|L]]|$1|W|3|-4|5|6|7|1E|8|@]|D|@]|E|$]]]|X|$]]

For me <code>git clean -f</code> removed all *.oig files. And keeps the ones that were already there before.

This is what it (almost) looked like after the merge:

<pre><code>$ git status
On branch feature/xyz
Your branch is ahead of 'origin/feature/xyz' by 568 commits.
 (use "git push" to publish your local commits)

Untracked files:
 (use "git add &lt;file&gt;..." to include in what will be committed)

 .idea/codeStyles/
 .idea/misc.xml.orig
</code></pre>

<code>.idea/codeStyles/</code> was already there before the merge as an untracked file. <code>.idea/misc.xml.orig</code> (and a lot more) had to be removed.

=> Using <code>git clean -f</code>:

<pre><code>$ git clean -f
Removing .idea/misc.xml.orig
</code></pre>

resulted in:

<pre><code>$ git status
On branch feature/xyz
Your branch is ahead of 'origin/feature/xyz' by 568 commits.
 (use "git push" to publish your local commits)

Untracked files:
 (use "git add &lt;file&gt;..." to include in what will be committed)

 .idea/codeStyles/
</code></pre>

blocks|key|481146|text|您可以简单地执行git+status+-s+%7C+grep+"\.orig$"+%7C+awk+'{print+$2}'+%7C+xargs+-n1+-r+echo+rm|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|481147|TL;DR；|481148|git+status+-s允许您获取与索引相关的所有修改/丢失的文件|481149|grep+"\.orig$"会过滤掉文件，并以".orig“结尾|481150|awk+'{print+$2}'列出文件名(跳过git信息，例如A、M、？)|481151|xargs+-n1+-r+echo+rm对每个参数(-n1:一次一个，空时为-r:+skip+)打印remove命令，只需复制并粘贴命令，然后仔细检查要删除的文件。|481152|entityMap^0|8|20|0|0|0|D|0|0|E|0|0|G|0|0|K|0^^$0|@$1|2|3|4|5|6|7|R|8|@$9|S|A|T|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|U|8|@]|D|@]|E|$]]|$1|H|3|I|5|6|7|V|8|@$9|W|A|X|B|C]]|D|@]|E|$]]|$1|J|3|K|5|6|7|Y|8|@$9|Z|A|10|B|C]]|D|@]|E|$]]|$1|L|3|M|5|6|7|11|8|@$9|12|A|13|B|C]]|D|@]|E|$]]|$1|N|3|O|5|6|7|14|8|@$9|15|A|16|B|C]]|D|@]|E|$]]|$1|P|3|-4|5|6|7|17|8|@]|D|@]|E|$]]]|Q|$]]

you can simply do <code>git status -s | grep "\.orig$" | awk '{print $2}' | xargs -n1 -r echo rm</code>

TL;DR;

<code>git status -s</code> allows you to get all modified/missing files in respect of the index

<code>grep "\.orig$"</code> filter out files, keeping the ending by ".orig"

<code>awk '{print $2}'</code> lists file name (skipping git information e.g. A, M, ??)

<code>xargs -n1 -r echo rm</code> prints remove commands on every arguments (-n1: one at a time and -r: skip when empty) just copy&amp;paste the commands double-checking for files to remove.

blocks|key|481211|text|您可以使用pre-commit钩子自动执行此过程。为此，只需进入您的项目文件夹，并搜索隐藏的文件夹.git。在它里面，你会找到hooks目录，打开它，然后用下面的cr8命令打开一个名为pre-commit的文件：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|481212|echo+"Looking+for+.orig+files+to+remove"
pwd=$(pwd)
find+.+-name+'*.orig'+-delete+
echo+"Done+removing+.orig+files"|code-block|syntax|javascript|481213|现在它会在你提交某些东西之前清理orig文件，所以没有必要把它保存在gitignore中。|481214|entityMap^0|1D|4|1R|5|2K|A|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]]|D|@]|E|$]]|$1|F|3|G|5|H|7|V|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|W|8|@]|D|@]|E|$]]|$1|M|3|-4|5|6|7|X|8|@]|D|@]|E|$]]]|N|$]]

You can automate this process with pre-commit hook. To do so, just go inside you project folder, and search for hidden folder <code>.git</code>.
Inside it you will find <code>hooks</code> directory, open it and cr8 a file named <code>pre-commit</code> with the next contains:
<pre><code>echo &quot;Looking for .orig files to remove&quot;
pwd=$(pwd)
find . -name '*.orig' -delete 
echo &quot;Done removing .orig files&quot;
</code></pre>
Now it will cleanup orig files always before you committed something, so no necessary to keep it in gitignore.

Some how .orig files are checked in my git repository during merge, which are now displayed in modified and un-tracked sector. But I don't want this files anymore in my repository. How to do that.

<pre><code> modified: Gemfile.lock.orig
 # modified: Gemfile.orig
 # modified: app/assets/images/bg_required.png.orig
 # modified: app/assets/javascripts/application.js.orig

 etc...
</code></pre>

Any help will be appreciated.

How to delete  .orig files after merge from git repository?

Windows

一些在合并期间如何在我的git存储库中检查.orig文件，这些文件现在显示在已修改和未跟踪的扇区中。但我不想让这些文件再出现在我的存储库中。如何做到这点。    modified:   Gemfile.lock.orig    #   modified:   Gemfile.orig    #   modified: ...

问如何从git仓库中删除合并后的.orig文件？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何从git仓库中删除合并后的.orig文件？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何从git仓库中删除合并后的.orig文件？
EN