git merge

mkdir ../week_change
cp -rp --parents `git diff --name-only bbbb HEAD` ../week_change/   ----从上次之后的master上的修改
-- 清理目录
cd ../week_change/
rm res_ui -r
rm res_ui2/data/final_data -r
rm res_ui2/ui2.lua
rm res_fx/data/fx3 -r
rm res_fx/meta -r
rm res_fx/fx4.lua -r
rm texpack_data -r

mv res_ui2 res_ui
mv res_fx/data/fx4 res_fx/data/fx3


find . | grep '\./.*\..*' > ../changed_file  -- 修改文件列表

-- 切到gangtai分支
mkdir ../gangtai_change
cp -rp --parents `cat ../changed_file` ../gangtai_change