Getting Git to Acknowledge Previously Moved Files
I've moved a bunch of files around manually without thinking, and can't find a way to get git to recognize that the files are just moved and not actually different files. Is there a way to do this other than removing old and adding the new (and thus losing the history), or redoing all the changes with git-mv?
I think it already does this. Now, I could be wrong, but I've read that git tracks files based on their contents not based on their position in the file system or based on delta/differences. In the stack I think it shows it as if the files are being removed and the then re-added, but I think I've tried this once and it still maintained the history, due to the aforementioned way that git tracks things.
Still would be helpful for someone to verify if I'm correct or not. Sorry if I misunderstood your question.
要让git删除已被移除或移动的文件，只需输入
git add -u
git doesn't track the history of individual files and it doesn't treat moves and copies specially, that is there is no special metadata that indicates that a move or copy occurred. Instead each git commit is a complete snapshot of the working tree.
If you want to see moves in git log you can supply -M in addition to an option that lists which files have changed, eg
git log --summary -M
git will look at the adjacent trees in the commit history and infer if any files where moved by each commit.
To find copies as well as renames you can use the -C option, you can supply it twice to make git look harder for possible copy sources at the expense of some performance.
git log --summary -M -C -C
Note, that as git doesn't store file history (only commit history), even if you did git rm and git mv the file, you wouldn't lose any history. All changes to the path would still be recorded and visible in a git log .
上一篇: 承诺Git在外部合并3
下一篇: 让Git确认以前移动的文件