如果我使用git mv命令移动Git跟踪文件而不是仅使用MS-DOS move或Windows资源管理器移动文件,这会有所不同吗?
回到Subversion时代,有必要使用例如TortoiseSVN SVN Move versioned files here命令来保持历史不变.
我希望它在Git中以相同的方式工作,但是测试(参见下面的示例)显示Git自己检测到文件已被移动并且历史记录保持不变.
那么为什么要使用git mv呢?
C:\test>git init
C:\test>mkdir folder
C:\test>cd folder
C:\test\folder>echo "1" > file.txt
C:\test\folder>git add .
C:\test\folder>git commit -m "Initial commit"
C:\test\folder>echo "2" >> file.txt
C:\test\folder>git add .
C:\test\folder>git commit -m "Update file.txt"
C:\test\folder>move file.txt ..
C:\test\folder>cd ..
C:\test>git status
On branch master
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
deleted: folder/file.txt
Untracked files:
(use "git add <file>..." to include in what will be committed)
file.txt
no changes added to commit (use "git add" and/or "git commit -a")
C:\test>git add -A
C:\test>git status
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
renamed: folder/file.txt -> file.txt
C:\test>git commit -m "Moved file.txt with the move command"
Run Code Online (Sandbox Code Playgroud)
尽管没有使用git mv,整个历史记录仍然保留,Git表示已经检测到重命名.
C:\test>git log --oneline --follow file.txt
6bd3c05 Moved file.txt with the move command
5b55aea Update file.txt
5b9b255 Initial commit
Run Code Online (Sandbox Code Playgroud)
当您使用git mv它时,将为您索引修改
如果您使用操作系统手动执行此操作,则需要执行此操作
git add -A <previous-path-to-file-that-was-moved>
git add <new-path-to-file>
Run Code Online (Sandbox Code Playgroud)
所以git知道你实际上重命名了文件.