• 代理polipo => shadowsocks
• 全局github账号
• 将git diff扩展为git d -- 使用vimdiff
• Git中文显示问题解决

• git submodule add <submodule_url>, submodule信息保存在项目根目录的.gitmodules文件中

• git diff --cached <submodule_name>
• git diff --cached --submodule for details
  • git config --global diff.submodule log, 将带submodule details作为diff的默认行为

• git clone <submodule_url>, 含submodule目录但无内容
• git submodule init, 初始化本地配置文件
• git submodule update, 拿到submodule内容

• git clone --recursive <submodule_url>

• 进入submodule所在目录
• git fetch, 获取origin/master到本地
• git merge origin/master, 将origin/master合并到本地的master中

• git submodule update --remote <submodule_name>
• git submodule update --remote, update all submodules

• git config -f .gitmodules submodule.<submodule_name>.branch <branch_name>
• git config submodule.<submodule_name>.branch <branch_name>, only for yourself locally

git config --global diff.tool vimdiff
git config --global difftool.prompt false
git config --global alias.d difftool
git config --global difftool.trustExitCode true

• usage
  • git diff: normal diff
  • git d or git difftool: vimdiff
  • :qa: quit this file pair
  • :cq: quit all file pairs
  • git d HEAD: working vs newest
  • git d –stage: working vs staged