# git的最常见操作

 

 

 

 

 

# git的最常见操作

git clone ...
git status

git branch -a

git add .
git commit -m ""
git commit -am ""

git remote -v (查看推送到远程哪个分支上)
git push origin master (提交远程的master)

 

 

--- --- --- 分支开发 --- --- ---
创建远程分支:
git checkout -b dev
推送分支到远程:
git push origin dev
同名可以直接推到 git push 默认远程也是一样的
删除
git branch -d dev 删除本地
git push origin --delete dev 删除远程分支

 

--- --- --- merge分支 --- --- ---
git checkout master
git merge dev
... 解决冲突 ...
git push origin master

 

 

--- --- --- 删除分支 --- --- ---

git branch -d dev

删除远程dev分支的方式
git push origin --delete dev 
git push origin :dev

 

 

--- --- --- 退回版本 --- --- ---

查看所有版本:
git log
git reflog --pretty=oneline

回退版本:
git reset --hard head^ 上一个版本
git reset --hard xxx