blocks|key|3105949|text|不做重命名跟踪也不做复制跟踪，这意味着它不会记录Git重命名或复制。相反，它所做的是重命名和复制检测。您可以使用-M选项在git+diff+(和git+show)中请求重命名检测，也可以使用-C选项在已更改的文件中请求额外的复制检测，并且可以使用-C+-C在所有文件之间请求更昂贵的复制检测。请参阅git-diff手册页。|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|CODE|entityRanges|data|3105950|-C+-C表示-C，-C表示-M。|3105951|-M是--find-renames的缩写，-C表示--find-copies和-C+-C也可以拼写为--find-copies-harder。|3105952|你还可以通过将diff.renames设置为布尔型真值(例如true或1)来配置git始终执行重命名检测，也可以通过将其设置为copy或copies来请求git执行复制检测。请参阅git-config手册页。|3105953|还要检查git+diff的-l选项和相关的配置变量diff.renameLimit。|3105954|3105955|注意，git+log+<pathspec>在Git中的工作方式不同:这里的<pathspec>是一组路径分隔符，其中path可以是一个(子)目录名称。在重命名和复制检测开始发挥作用之前，它可以过滤和简化历史。如果你想跟踪重命名和副本，使用git+log+--follow+<filename>+(它目前有一点限制，只适用于单个文件)。|3105956|entityMap|0|LINK|mutability|MUTABLE|url|http://git-scm.com/docs/git-diff|1|http://git-scm.com/docs/git-config^0|1C|2|1K|2|1P|8|20|8|2N|2|3F|5|45|8|0|0|0|5|7|2|A|2|E|2|0|0|2|3|E|L|2|P|D|13|5|1E|K|0|7|C|U|4|Z|1|1R|4|1W|6|2I|A|1|0|4|8|D|2|P|G|0|0|3|I|11|A|3B|R|2V|1S|0^^$0|@$1|2|3|4|5|6|7|11|8|@$9|12|A|13|B|C]|$9|14|A|15|B|D]|$9|16|A|17|B|D]|$9|18|A|19|B|D]|$9|1A|A|1B|B|D]|$9|1C|A|1D|B|D]]|E|@$9|1E|A|1F|1|1G]]|F|$]]|$1|G|3|H|5|6|7|1H|8|@$9|1I|A|1J|B|D]|$9|1K|A|1L|B|D]|$9|1M|A|1N|B|D]|$9|1O|A|1P|B|D]]|E|@]|F|$]]|$1|I|3|J|5|6|7|1Q|8|@$9|1R|A|1S|B|D]|$9|1T|A|1U|B|D]|$9|1V|A|1W|B|D]|$9|1X|A|1Y|B|D]|$9|1Z|A|20|B|D]|$9|21|A|22|B|D]]|E|@]|F|$]]|$1|K|3|L|5|6|7|23|8|@$9|24|A|25|B|D]|$9|26|A|27|B|D]|$9|28|A|29|B|D]|$9|2A|A|2B|B|D]|$9|2C|A|2D|B|D]]|E|@$9|2E|A|2F|1|2G]]|F|$]]|$1|M|3|N|5|6|7|2H|8|@$9|2I|A|2J|B|D]|$9|2K|A|2L|B|D]|$9|2M|A|2N|B|D]]|E|@]|F|$]]|$1|O|3|-4|5|6|7|2O|8|@]|E|@]|F|$]]|$1|P|3|Q|5|6|7|2P|8|@$9|2Q|A|2R|B|D]|$9|2S|A|2T|B|D]|$9|2U|A|2V|B|D]|$9|2W|A|2X|B|C]]|E|@]|F|$]]|$1|R|3|-4|5|6|7|2Y|8|@]|E|@]|F|$]]]|S|$T|$5|U|V|W|F|$X|Y]]|Z|$5|U|V|W|F|$X|10]]]]

Git does not do rename tracking nor copy tracking, which means it doesn't record renames or copies. What it does instead is rename and copy detection. You can request rename detection in <code>git diff</code> (and <code>git show</code>) by using the <code>-M</code> option, you can request additional copy detection in changed files by using the <code>-C</code> option instead, and you can request more expensive copy detection among all files with <code>-C -C</code>. See the <a href="http://git-scm.com/docs/git-diff" rel="noreferrer">git-diff</a> manpage.
<code>-C -C</code> implies <code>-C</code>, and <code>-C</code> implies <code>-M</code>.
<code>-M</code> is a shortcut for <code>--find-renames</code>, <code>-C</code> means <code>--find-copies</code> and <code>-C -C</code> can also be spelled out as <code>--find-copies-harder</code>.
You can also configure git to always do rename detection by setting <code>diff.renames</code> to a boolean true value (e.g. <code>true</code> or <code>1</code>), and you can request git to do copy detection too by setting it to <code>copy</code> or <code>copies</code>. See the <a href="http://git-scm.com/docs/git-config" rel="noreferrer">git-config</a> manpage.
Check also the <code>-l</code> option to <code>git diff</code> and the related config variable <code>diff.renameLimit</code>.
<hr />
Note that <code>git log &lt;pathspec&gt;</code> works differently in Git: here <code>&lt;pathspec&gt;</code> is set of path delimiters, where path can be a (sub)directory name. It filters and simplifies history before rename and copy detection comes into play. If you want to follow renames and copies, use <code>git log --follow &lt;filename&gt;</code> (which currently is a bit limited, and works only for a single file).

blocks|key|336639|text|如果由于某些原因你不能像Jakub+Nar+Git+bski的答案中那样打开复制检测，你可以强制ę在三次提交中检测复制文件的历史记录：|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|336640|使用无快进选项--no-ff.将新分支合并到原始分支，而不是复制|CODE|336641|，而是切换到新分支并将文件移动到新位置。|unordered-list-item|336642|在那里重新添加原始文件。|336643|将新分支合并到原始分支|336644|336645|致谢给Raymond+Chen。下面是他的程序。假设文件名为orig，而您希望副本名为apple|336646|git+checkout+-b+dup+#+create+and+switch+to+branch

git+mv+orig+apple+#+make+the+duplicate
git+commit+-m+"duplicate+orig+to+apple"

git+checkout+HEAD~+orig+#+bring+back+the+original
git+commit+-m+"restore+orig"

git+checkout+-+#+switch+back+to+source+branch
git+merge+--no-ff+dup+#+merge+dup+into+source+branch|code-block|syntax|javascript|336647|336648|2020-05-19:上述方案的优点是不改变原始文件的日志，不会造成合并冲突，而且更短。前一个解决方案有四个提交：|336649|切换到新分支并将文件移动到其新位置并将文件重命名为原始分支，而不是复制。|336650|将新分支合并到原始分支，通过在单独的提交中保留两个原始文件名来解决微不足道的冲突。|336651|336652|336653|(来自https://stackoverflow.com/a/44036771/1389680.的解决方案)|336654|entityMap|0|LINK|mutability|MUTABLE|url|https://devblogs.microsoft.com/oldnewthing/20190919-00/?p=102904|1|https://stackoverflow.com/a/44036771/1389680.^0|12|4|0|7|7|0|0|0|0|0|U|4|17|5|3|C|0|0|0|0|0|0|0|0|0|3|19|1|0^^$0|@$1|2|3|4|5|6|7|1I|8|@$9|1J|A|1K|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|1L|8|@$9|1M|A|1N|B|H]]|D|@]|E|$]]|$1|I|3|J|5|K|7|1O|8|@]|D|@]|E|$]]|$1|L|3|M|5|K|7|1P|8|@]|D|@]|E|$]]|$1|N|3|O|5|K|7|1Q|8|@]|D|@]|E|$]]|$1|P|3|-4|5|6|7|1R|8|@]|D|@]|E|$]]|$1|Q|3|R|5|6|7|1S|8|@$9|1T|A|1U|B|H]|$9|1V|A|1W|B|H]]|D|@$9|1X|A|1Y|1|1Z]]|E|$]]|$1|S|3|T|5|U|7|20|8|@]|D|@]|E|$V|W]]|$1|X|3|-4|5|6|7|21|8|@]|D|@]|E|$]]|$1|Y|3|Z|5|6|7|22|8|@]|D|@]|E|$]]|$1|10|3|11|5|6|7|23|8|@]|D|@]|E|$]]|$1|12|3|13|5|K|7|24|8|@]|D|@]|E|$]]|$1|14|3|-4|5|K|7|25|8|@]|D|@]|E|$]]|$1|15|3|-4|5|6|7|26|8|@]|D|@]|E|$]]|$1|16|3|17|5|6|7|27|8|@]|D|@$9|28|A|29|1|2A]]|E|$]]|$1|18|3|-4|5|6|7|2B|8|@]|D|@]|E|$]]]|19|$1A|$5|1B|1C|1D|E|$1E|1F]]|1G|$5|1B|1C|1D|E|$1E|1H]]]]

If for some reason you cannot turn on copy detection as in Jakub Narębski's answer, you can force Git to detect the history of the copied file in three commits:
<ul>
<li>Instead of copying, switch to a new branch and move the file to its new location there.</li>
<li>Re-add the original file there.</li>
<li>Merge the new branch to the original branch with the no-fast-forward option <code>--no-ff</code>.</li>
</ul>
Credits to <a href="https://devblogs.microsoft.com/oldnewthing/20190919-00/?p=102904" rel="nofollow noreferrer">Raymond Chen</a>. What follows is his procedure. Say the file is named <code>orig</code>, and you want the duplicate to be named <code>apple</code>:
<pre><code>git checkout -b dup # create and switch to branch

git mv orig apple # make the duplicate
git commit -m &quot;duplicate orig to apple&quot;

git checkout HEAD~ orig # bring back the original
git commit -m &quot;restore orig&quot;

git checkout - # switch back to source branch
git merge --no-ff dup # merge dup into source branch
</code></pre>
<hr />
2020-05-19: The above solution has the advantages of not changing the log of the original file, not creating a merge conflict, and being shorter. The former solution had four commits:
<ul>
<li>Instead of copying, switch to a new branch and move the file to its new location there.</li>
<li>Switch to the original branch and rename the file.</li>
<li>Merge the new branch into the original branch, resolving the trivial conflict by keeping both files.</li>
<li>Restore the original filename in a separate commit.</li>
</ul>
(Solution taken from <a href="https://stackoverflow.com/a/44036771/1389680.">https://stackoverflow.com/a/44036771/1389680.</a>)

When I move a file in git using git-mv the status shows that the file has been renamed and even if I alter some portions it still considers to be almost the same thing (which is good because it lets me follow the history of it). 

When I copy a file the original file has some history I'd like to associate with the new copy.

I have tried moving the file then trying to re-checkout in the original location - once moved git won't let me checkout the original location.

I have tried doing a filesystem copy and then adding the file - git lists it as a new file.

Is there any way to make git record a file copy operation in a similar way to how it records a file rename/move where the history can be traced back to the original file?

Record file copy operation with Git

当我使用git-mv在git中移动文件时，状态显示该文件已被重命名，即使我更改了某些部分，它仍然认为是几乎相同的东西(这很好，因为它让我跟踪它的历史)。当我复制一个文件时，原始文件有一些历史记录，我希望将其与新的副本相关联。我尝试过移动文件，然后尝试在原始位置重新签出-一旦移动，git就不会让我签出原始位置。我尝试过复...

问使用Git记录文件复制操作
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问使用Git记录文件复制操作EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问使用Git记录文件复制操作
EN