Git can';t跟踪重命名的文件
我看到了其他问题。他们说,如果要在git中重命名文件,只需使用Git can';t跟踪重命名的文件,git,Git,我看到了其他问题。他们说,如果要在git中重命名文件,只需使用git mv 但我只是使用MacGUI重命名了一个文件(选择文件,输入按钮,重命名)。我将文件文件夹Samples/oculusworldemo/Bin/Mac/Release/data/更改为Samples/oculusworldemo/Bin/Mac/Release/dataInUse/,并做了一些其他更改。但我无法将新文件夹dataInUse添加到git 以下是我的命令和git响应: ken@rescomp-14-293
git mv
但我只是使用MacGUI重命名了一个文件(选择文件,输入按钮,重命名)。我将文件文件夹Samples/oculusworldemo/Bin/Mac/Release/data/
更改为Samples/oculusworldemo/Bin/Mac/Release/dataInUse/
,并做了一些其他更改。但我无法将新文件夹dataInUse添加到git
以下是我的命令和git响应:
ken@rescomp-14-293006:~/Dropbox/aaRA/杂七杂八相关/OculusSDK$ git status
On branch changeByIterNum
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)
modified: LibOVR/Lib/Mac/Release/LibOVR.build/build-state.dat
deleted: Samples/CommonSrc/data/iris.data3D
modified: Samples/LibOVR_With_Samples.xcworkspace/xcuserdata/ken.xcuserdatad/UserInterfaceState.xcuserstate
modified: Samples/LibOVR_With_Samples.xcworkspace/xcuserdata/ken.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
modified: Samples/OculusWorldDemo/Bin/Mac/Release/.DS_Store
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.app.dSYM/Contents/Resources/DWARF/OculusWorldDemo
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.app/Contents/MacOS/OculusWorldDemo
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/Objects-normal/x86_64/OculusWorldDemo.dia
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/Objects-normal/x86_64/OculusWorldDemo.o
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/Objects-normal/x86_64/OculusWorldDemo_Scene.o
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/Objects-normal/x86_64/ReadDataRunML.o
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/OculusWorldDemo.dep
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/build-state.dat
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/.DS_Store
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/2D display/0.001 500000.png
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/2D display/0.01 10000000.png
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/2D display/0.01 2000000.png
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/2D display/0.05 500000.png
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/displayDataFirst2D.py
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/displayDataFirst3D.py
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.data
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.data1
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.data2D
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.data3D
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.datatest
modified: Samples/OculusWorldDemo/OculusWorldDemo.cpp
modified: Samples/OculusWorldDemo/OculusWorldDemo.h
modified: Samples/OculusWorldDemo/ReadDataRunML.cpp
modified: Samples/OculusWorldDemo/ReadDataRunML.h
deleted: Samples/OculusWorldDemo/data/iris.data3D
deleted: Samples/data/iris.data3D
deleted: data/iris.data3D
Untracked files:
(use "git add <file>..." to include in what will be committed)
Samples/LibOVR_With_Samples.xcworkspace/xcshareddata/LibOVR_With_Samples.xccheckout
no changes added to commit (use "git add" and/or "git commit -a")
ken@rescomp-14-293006:~/Dropbox/aaRA/杂七杂八相关/OculusSDK$ git add .
ken@rescomp-14-293006:~/Dropbox/aaRA/杂七杂八相关/OculusSDK$ git status
On branch changeByIterNum
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: .DS_Store
modified: LibOVR/Lib/Mac/Release/LibOVR.build/build-state.dat
new file: Samples/LibOVR_With_Samples.xcworkspace/xcshareddata/LibOVR_With_Samples.xccheckout
modified: Samples/LibOVR_With_Samples.xcworkspace/xcuserdata/ken.xcuserdatad/UserInterfaceState.xcuserstate
modified: Samples/LibOVR_With_Samples.xcworkspace/xcuserdata/ken.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
modified: Samples/OculusWorldDemo/Bin/Mac/Release/.DS_Store
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.app.dSYM/Contents/Resources/DWARF/OculusWorldDemo
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.app/Contents/MacOS/OculusWorldDemo
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/Objects-normal/x86_64/OculusWorldDemo.dia
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/Objects-normal/x86_64/OculusWorldDemo.o
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/Objects-normal/x86_64/OculusWorldDemo_Scene.o
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/Objects-normal/x86_64/ReadDataRunML.o
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/OculusWorldDemo.dep
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/build-state.dat
modified: Samples/OculusWorldDemo/OculusWorldDemo.cpp
modified: Samples/OculusWorldDemo/OculusWorldDemo.h
modified: Samples/OculusWorldDemo/ReadDataRunML.cpp
modified: Samples/OculusWorldDemo/ReadDataRunML.h
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: Samples/CommonSrc/data/iris.data3D
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/.DS_Store
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/2D display/0.001 500000.png
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/2D display/0.01 10000000.png
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/2D display/0.01 2000000.png
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/2D display/0.05 500000.png
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/displayDataFirst2D.py
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/displayDataFirst3D.py
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.data
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.data1
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.data2D
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.data3D
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.datatest
deleted: Samples/OculusWorldDemo/data/iris.data3D
deleted: Samples/data/iris.data3D
deleted: data/iris.data3D
ken@rescomp-14-293006:~/Dropbox/aaRA/杂七杂八相关/OculusSDK$ git add --all .
ken@rescomp-14-293006:~/Dropbox/aaRA/杂七杂八相关/OculusSDK$ git status
On branch changeByIterNum
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: .DS_Store
modified: LibOVR/Lib/Mac/Release/LibOVR.build/build-state.dat
deleted: Samples/CommonSrc/data/iris.data3D
new file: Samples/LibOVR_With_Samples.xcworkspace/xcshareddata/LibOVR_With_Samples.xccheckout
modified: Samples/LibOVR_With_Samples.xcworkspace/xcuserdata/ken.xcuserdatad/UserInterfaceState.xcuserstate
modified: Samples/LibOVR_With_Samples.xcworkspace/xcuserdata/ken.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
modified: Samples/OculusWorldDemo/Bin/Mac/Release/.DS_Store
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.app.dSYM/Contents/Resources/DWARF/OculusWorldDemo
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.app/Contents/MacOS/OculusWorldDemo
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/Objects-normal/x86_64/OculusWorldDemo.dia
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/Objects-normal/x86_64/OculusWorldDemo.o
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/Objects-normal/x86_64/OculusWorldDemo_Scene.o
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/Objects-normal/x86_64/ReadDataRunML.o
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/OculusWorldDemo.dep
modified: Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/build-state.dat
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/.DS_Store
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/2D display/0.001 500000.png
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/2D display/0.01 10000000.png
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/2D display/0.01 2000000.png
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/2D display/0.05 500000.png
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/displayDataFirst2D.py
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/displayDataFirst3D.py
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.data
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.data1
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.data2D
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.data3D
deleted: Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.datatest
modified: Samples/OculusWorldDemo/OculusWorldDemo.cpp
modified: Samples/OculusWorldDemo/OculusWorldDemo.h
modified: Samples/OculusWorldDemo/ReadDataRunML.cpp
modified: Samples/OculusWorldDemo/ReadDataRunML.h
deleted: Samples/OculusWorldDemo/data/iris.data3D
deleted: Samples/data/iris.data3D
deleted: data/iris.data3D
ken@rescomp-14-293006:~/Dropbox/aaRA/杂七杂八相关/OculusSDK$git状态
关于分支变换
未为提交而暂存的更改:
(使用“git add/rm…”更新将提交的内容)
(使用“git签出--…”放弃工作目录中的更改)
修改:LibOVR/Lib/Mac/Release/LibOVR.build/build-state.dat
已删除:Samples/CommonSrc/data/iris.data3D
修改:Samples/LibOVR_With_Samples.xcworkspace/xcuserdata/ken.xcuserdatad/UserInterfaceState.xcuserstate
修改:Samples/LibOVR_With_Samples.xcworkspace/xcuserdata/ken.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
修改:Samples/oculusworldemo/Bin/Mac/Release/.DS\u商店
修改:Samples/oculusworldemo/Bin/Mac/Release/oculusworldemo.app.dSYM/Contents/Resources/DWARF/oculusworldemo
修改:Samples/oculusworldemo/Bin/Mac/Release/oculusworldemo.app/Contents/MacOS/oculusworldemo
修改:Samples/oculusworldemo/Bin/Mac/Release/oculusworldemo.build/Objects-normal/x86_64/oculusworldemo.dia
修改:Samples/oculusworldemo/Bin/Mac/Release/oculusworldemo.build/Objects normal/x86_64/oculusworldemo.o
修改:Samples/oculusworldemo/Bin/Mac/Release/oculusworldemo.build/Objects normal/x86_64/oculusworldemo_Scene.o
修改:Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/Objects normal/x86_64/ReadDataRunML.o
修改:Samples/oculusworldemo/Bin/Mac/Release/oculusworldemo.build/oculusworldemo.dep
修改:Samples/oculusworldemo/Bin/Mac/Release/oculusworldemo.build/build-state.dat
删除:Samples/OculusWorldDemo/Bin/Mac/Release/data/.DS\u商店
删除:Samples/OculusWorldDemo/Bin/Mac/Release/data/2D display/0.001 500000.png
删除:Samples/OculusWorldDemo/Bin/Mac/Release/data/2D display/0.01 10000000.png
删除:Samples/OculusWorldDemo/Bin/Mac/Release/data/2D display/0.01 2000000.png
删除:Samples/OculusWorldDemo/Bin/Mac/Release/data/2D display/0.05 500000.png
删除:Samples/OculusWorldDemo/Bin/Mac/Release/data/displayDataFirst2D.py
删除:Samples/OculusWorldDemo/Bin/Mac/Release/data/displayDataFirst3D.py
删除:Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.data
删除:Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.data1
删除:Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.data2D
删除:Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.data3D
删除:Samples/OculusWorldDemo/Bin/Mac/Release/data/iris.datatest
修改:Samples/oculusworldemo/oculusworldemo.cpp
修改:Samples/OculusWorldDemo/OculusWorldDemo.h
修改:Samples/OculusWorldDemo/ReadDataRunML.cpp
修改:Samples/OculusWorldDemo/ReadDataRunML.h
删除:Samples/OculusWorldDemo/data/iris.data3D
已删除:Samples/data/iris.data3D
已删除:data/iris.data3D
未跟踪的文件:
(使用“git add…”包含在将提交的内容中)
Samples/LibOVR_With_Samples.xcworkspace/xcshareddata/LibOVR_With_Samples.xcheckout
未向提交添加任何更改(使用“git add”和/或“git commit-a”)
ken@rescomp-14-293006:~/Dropbox/aaRA/杂七杂八相关/OculusSDK$git add。
ken@rescomp-14-293006:~/Dropbox/aaRA/杂七杂八相关/OculusSDK$git状态
关于分支变换
要提交的更改:
(使用“git重置磁头…”取消分级)
已修改:.DS\u存储
修改:LibOVR/Lib/Mac/Release/LibOVR.build/build-state.dat
新文件:Samples/LibOVR\u With_Samples.xcworkspace/xcshareddata/LibOVR\u With_Samples.xcheckout
修改:Samples/LibOVR_With_Samples.xcworkspace/xcuserdata/ken.xcuserdatad/UserInterfaceState.xcuserstate
修改:Samples/LibOVR_With_Samples.xcworkspace/xcuserdata/ken.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
修改:Samples/oculusworldemo/Bin/Mac/Release/.DS\u商店
修改:Samples/oculusworldemo/Bin/Mac/Release/oculusworldemo.app.dSYM/Contents/Resources/DWARF/oculusworldemo
修改:Samples/oculusworldemo/Bin/Mac/Release/oculusworldemo.app/Contents/MacOS/oculusworldemo
修改:Samples/oculusworldemo/Bin/Mac/Release/oculusworldemo.build/Objects-normal/x86_64/oculusworldemo.dia
修改:Samples/oculusworldemo/Bin/Mac/Release/oculusworldemo.build/Objects normal/x86_64/oculusworldemo.o
修改:Samples/oculusworldemo/Bin/Mac/Release/oculusworldemo.build/Objects normal/x86_64/oculusworldemo_Scene.o
修改:Samples/OculusWorldDemo/Bin/Mac/Release/OculusWorldDemo.build/Objects normal/x86_64/ReadDataRunML.o
修改:Samples/oculusworldemo/Bin/Mac/Release/oculusworldemo.build/oculusworldemo.dep
修改:Samples/oculusworldemo/Bin/Mac/Release/oculusworldemo.build/build-state.dat
修改:Samples/oculusworldemo/oculusworldemo.cpp
修改:Samples/OculusWorldDemo/OculusWorldDemo.h
修改:Samples/OculusWorldDemo/ReadDataRunML.cpp
修改:Samples/OculusWorldDemo/ReadDataRunML.h
未为提交而暂存的更改:
(使用“git add/rm…”更新将提交的内容)
(使用“git签出--…”放弃工作目录中的更改)
已删除:Samples/CommonSrc/data/iris.data3D
德尔
git rm --cached old_name
git add new_name
git mv old_name new_name
git status | grep -A1024 -E '^Changes not staged' | grep 'deleted:' | cut -d: -f2 | xargs git rm --cached
git status | grep -A1024 -E '^Untracked' | grep -E '^\s+\w' | xargs git add