Git学习启示录

Copy自廖雪峰的Web

[廖雪峰同志的内心世界][001] [001]: http://www.liaoxuefeng.com/wiki "廖雪峰同志的内心世界" 疯狂的推酷 [001]: http://www.xxx.com "廖雪峰同志的内心世界"

Git之整装出发

git diff

git log --graph --pretty=oneline --abbrev-commit
git diff commit1-id commit2-id
git diff commit1-id commit2-id >> conflict.log

坚定不移的时光分割线 >> 再次坚定而磐石无转移地分割

git merge dev
git log / git reflog

~~老大我错了~~
git log --graph --pretty=oneline --abbrev-commit ｀｀｀ git log --graph --pretty=oneline --abbrev-commit ｀｀｀
git branch -d feature1
git stash
git stash list
git stash pop = git stash apply git stash drop
git branch -d feature-vulcan / git branch -D feature-vulcan
git remote -v
git push origin master/dev
git checkout -b dev origin/dev
git branch --set-upstream dev origin/dev
git tag v1.0
git tag
git tag v0.9 6224937
git show tag-name
git server-self:

行为	命令	说明
安装git	sudo apt-get install git
创建用户	sudo adduser git
创建证书	then，创建证书登录：收集所有需要登录的用户的公钥，就是他们自己的id_rsa.pub文件
导入证书	把所有公钥导入到/home/git/.ssh/authorized_keys文件里，一行一个
创建仓库	sudo git init --bare sample.git
赋予权限	sudo chown -R git:git sample.git
下载仓库	git clone git@server:/srv/sample.git