GIT使用

GIT简单操作指南: http://www.bootcss.com/p/git-guide/

GIT reset, revert, checkout区别 https://segmentfault.com/a/1190000003102737

谬雪峰的教程也很不错 http://www.liaoxuefeng.com/wiki/0013739516305929606dd18361248578c67b8067c8c017b000 

GIT 删除了本地文件, 想要从服务端分支恢复

如果没有commit, 使用

git checkout -- <path/folder/file>

如果commit了,而且暂存区也清了, 只是想从服务端获取(这个有待研究, 可能重置整个目录)

git checkout HEAD~2

提取出常用的GIT命令

git init


git clone /path/to/repository

git clone username@host:/path/to/repository


git add <filename>

git add *

git commit -m "代码提交信息"

git commit -a -m "代码提交信息"


git push origin master

git remote add origin <server>


git checkout -b feature_x

git checkout master


git branch -d feature_x

git push origin <branch>


git pull

git merge <branch>

git add <filename>

git diff <source_branch> <target_branch>


git tag 1.0.0 1b2e1d63ff

git log


git checkout -- <filename>

git fetch origin

git reset --hard origin/master


gitk

git config color.ui true

git config format.pretty oneline

git add -i