使用Git记录文件复制操作-RecordfilecopyoperationwithGit

102  

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 git diff (and git show) by using the -M option, you can request additional copy detection in changed files by using the -C option (-C implies -M), and you can request more expensive copy detection among all files with --find-copies-harder or -C -C (which implies -C, which implies -M). See the git-diff manpage.

Git不会重命名跟踪也不会复制跟踪，这意味着它不会记录重命名或副本。它的作用是重命名和复制检测。您可以使用-M选项在git diff（和git show）中请求重命名检测，您可以使用-C选项（-C表示-M）在更改的文件中请求其他副本检测，并且您可以请求更昂贵的副本使用--find-copies-harder或-C-C（暗示-C，暗示-M）检测所有文件。请参阅git-diff联机帮助页。

You can also configure git to always do rename detection by setting diff.renames to a boolean true value (e.g. true or 1), and you can request git to do copy detection too by setting it to copy or copies. See the git-config manpage.

您还可以将git配置为始终通过将diff.renames设置为布尔值true（例如true或1）来进行重命名检测，并且您可以通过将git设置为复制或复制来请求git进行复制检测。请参阅git-config联机帮助页。

Check also the -l option to git diff and the related config variable diff.renameLimit.

还要检查git diff的-l选项和相关的配置变量diff.renameLimit。

Note that git log works differently in Git: here 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 git log --follow (which currently is a bit limited, and works only for single file).

请注意，git log 在Git中的工作方式不同：此处 是路径分隔符集，其中path可以是（子）目录名。在重命名和复制检测发挥作用之前，它会过滤并简化历史记录。如果要关注重命名和副本，请使用git log --follow （目前有点限制，仅适用于单个文件）。

13  

You can force Git to detect the history of the copied file:

您可以强制Git检测复制文件的历史记录：

• Instead of copying, switch to a new branch and move the file to its new location there.
• 而不是复制，切换到新分支并将文件移动到其新位置。
• Switch to the original branch and rename the file.
• 切换到原始分支并重命名该文件。
• Merge the new branch into the original branch, resolving the trivial conflict by keeping both files.
• 将新分支合并到原始分支中，通过保留两个文件来解决琐碎的冲突。
• Restore the original filename in a separate commit.
• 在单独的提交中恢复原始文件名。

(Solution taken from https://stackoverflow.com/a/44036771/1389680.)

（解决方案取自https://stackoverflow.com/a/44036771/1389680。）