拉取远程分支
git init
git remote add origin ssh://XXXXXXXX.git
git fetch origin master
git checkout -b dev origin/master
git pull origin master
查看全部远程分支
git branch -a
解决文件路径过长的问题
git config --global core.longpaths true
撤销上一个commit
git reset --soft HEAD^
stash
git stash
git pull
git stash pop
git 提交到远程新分支
git push origin dev:dev-demand
查看commit日志
ideal commit message 乱码问题解决
git config --global i18n.commitencoding utf-8
git config --global gui.encoding utf-8
git config --global i18n.logoutputencoding utf-8
merge
git pull origin target
git fetch origin master
git merge origin/master
git merge --abort
git merge --continue
git push origin master