规范
- git的使用流程建议参考“Git使用规范流程”.[3]
- 建议
a.在特性开发时，commit要以逻辑为单位，鼓励小规模提交。但是，在确定要将特性分支合并到dev/master分支上时，建议对commit进行压缩，压缩的方法和原因参考[3]
b.在开发过程中，如果某个功能开发时间特别久，建议定期merge主分支
参考
git中利用rebase来压缩多次提交
http://blog.csdn.net/itfootball/article/details/44154121Git 使用规范流程
http://www.ruanyifeng.com/blog/2015/08/git-use-process.htmlA successful Git branching model
http://nvie.com/posts/a-successful-git-branching-model/
Git常用命令缩写
[user]
email = xxx@163.com
name = xxx
[core]
editor = vim
[alias]
save = !git add -A && git commit -m 'SAVEPOINT'
undo = reset HEAD~1 --mixed
wip = commit -am "WIP"
amend = commit -a --amend
wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
ld = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
lds = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
la = "!git config -l | grep alias | cut -c 7-"
lasttag = describe --tags --abbrev=0
lt = describe --tags --abbrev=0
week = log --author=xxx --after='1 week ago' --oneline --decorate
unmerge = log --no-merges master..
