01 2019 档案
摘要:# 查看当前代理 netsh winhttp show proxy # 设置代理netsh winhttp set proxy proxy-server="http=myproxy;https=sproxy:88" bypass-list="*.foo.com;10.0.0.0/8;" # 直接从IE导入 netsh winhttp import proxy source=ie # 关闭代理 n...
阅读全文
摘要:$ cat test 1 start 2 end 3 $ sed -n '1,/start/p;/end/,$p' test 1 start end 3 $ sed '/start/,/end/d' test 1 3
阅读全文
摘要:回退commit git log git reset --hard <commit_id> git push origin HEAD --force 解决合并冲突 git checkout -b conflict_fix # do some commit conflictly Auto-mergin
阅读全文