git

git remote -v:显示remote URL
git remote add pb git://github.com/paulboone/ticgit.git             :   Add Remote Repositories   (git fetch pb)\
git pull [remote-name]:会自动merge


git merge: http://blog.csdn.net/hudashi/article/details/7664631

**.erl  -----add------>staged fill -------commit----------->git directory(repository)
提交之前先git diff
git diff path/**.erl
git diff --staged  path/**.erl  比较staged文件和服务器上该文件的区别

add：一次add一个变化

git add -p path/**.erl :可以选择add哪些变化

add到staging area之后再进行commit

git commit -m "message"



rebase：
git   fetch
git rebase origin/master
解决冲突
git push --continue