git 命令小结

基本命令

git init [以当前目录为工作区，创建缓存区]
git add [file] [添加修改到缓存区]
git commit -m ” [提交更改]
git status [查看当前状态,是否存在更改为提交]
git diff [file] [查看文件修改前后差异]
git checkout [file] [撤销文件修改， 未执行git add 的修改]
git reset HEAD [file] [撤销提交到缓存区的修改]
git log [查看文件提交日志]
git log –pretty=oneline [查看简约提交, git commit 的]
git reset –hard HEAD^ [回滚到上一次提交]
git reset –hard HEAD^^ [回滚到上两次提交]
git reset –hard HEAD~100 [回滚到上100测提交]
git reset –head [commitId] [回滚到指定版本]
git reflog [查看git 执行命令记录]

远程厂库

ssh-keygen -t rsa -C “[e-mail]” [生成与远程厂库通信的秘钥]
git remote add origin [e-mail]:michaelliao/learngit.github [关联远程厂库]
git config –global user.name [name] [配置全局用户名]
gut config –global user.email [email] [配置全局用户邮箱]
git push -u origin master [推送到主分支]
git clone [url] [克隆远程项目]
git pull [刷新内容]
git checkout -b branch-name origin/branch-name [建立与远端相同的分支]
git branch –set-upstream branch-name origin/branch-name [建立分支连接]

分支

git checkout -b [branchName] [创建分支，并将HEAD切换到新创建分支上]
git branch [branchName] [创建分支]
git checkout [branchName] [切换HEAD到branchName分支上]
git branch [显示分支]
git merge [branchName] [合并分支]
git branch -d [branchName] [删除指定branchName分支]
git log –graph [查看分支合并等详情]
git merge –no-ff -m “merge with no-ff” dev [加上–no-ff 合并成功后可以查看分支信息]
git stash [可以把当前工作现场“储藏”起来，等以后恢复现场后继续工作]
git stash list [查看隐藏的内容]
git stash apply [恢复后，stash内容并不删除]
git stash drop [删除隐藏]
git stash pop [恢复并删除隐藏]
git branch -D f[branchName] [强行删除分支]

标签

git tag v1.0 [创建标签]
git tag [显示标签]
git tag v0.9 6224937 [如果忘记在commit时打标签，可以通过此命令补打]
git show [tagName] [显示标签详细信息]
git tag -d [tagName] [删除tagName标签]
git push origin v1.0 [推送标签到远程服务器]
git push origin –tags [一次性推送全部尚未推送到远程的本地标签]

别名

git config –global alias.st status [配置别名]
git config –global alias.co checkout
git config –global alias.ci commit
git config –global alias.br branch
git config –global alias.unstage ‘reset HEAD’