数据库更新用户密码
update user.User_Tab set Password=‘4F0KP’,Regdate=‘2015-09-11 09:09:01’ where id = 50;
git合并分支不一样的文件
git diff;git format-patch
git apply;
git am --keep-cr
git apply --stat patch-file
git apply --check patch-file
git apply --whitespace=fix patch-file 换行符
git apply --reject patch-file 强制
通过squash等合并分支命令自动化部署
git pull origin master
git checkout master;git pull origin master
git diff branch1 branch2 --stat > 上线文件.txt
git merge --squash trademark_apply
git checkout HEAD
git diff >…/file.patch
git diff branch1 branch2 > …/file.patch
git checkout . ; git clean -f
git checkout selfBranch