修改文件后查看路径下的修改内容:git diff xx/xx
将修改内容打成patch:git diff xx/xx > xxx.patch
删除修改:git checkout xx/xx
将patch合入文件中(到patch文件的根目录下):patch -p1 < xxx.patch
修改文件后查看路径下的修改内容:git diff xx/xx
将修改内容打成patch:git diff xx/xx > xxx.patch
删除修改:git checkout xx/xx
将patch合入文件中(到patch文件的根目录下):patch -p1 < xxx.patch