Drink it: git commonly used commands

Access to personal use only, please correct me if wrong also.

Basic Operations

git init
git clone HTTPS
git clone -b dev HTTPS
git add .
git add demo.py
git status
git commit -m ''
git pull
git push
git checkout dev
git diff HEAD -- filename 

Creating a branch

git branch dev  

Deleted branches

git branch -d dev

Delete remote branch

git push origin --delete dev

View branch

git branch          本地
git branch -r       远端
git branch -a       所有

Remote branch pulled local branch

创建分支，切换分支，再拉下来。
git branch dev  
git checkout -b dev
git fetch origin dev

Create a remote branch of the same name and switch

git checkout -b dev origin/dev

Local branch submitted to the remote branch

git push origin localbranch:remotebranch

Merged into the main branch development branch

切换到master分支，同步最新主分支代码，切换到dev分支，然后合并，同步远端dev
git checkout master
git pull
git checkout dev
git merge master
git push    

Free branch into a main branch

git checkout dev
git pull    
git check master
git merge dev
git push

git log

git log 查看日志
Q       退出日志

Give up the local modifications

git reset --hard commit的号码（git log查询）
git reset --hard 2626f1cfbb2fb9bcceef3995db5d901b02b5e88f
git pull

pull merge local conflict resolution

git stash       先将本地修改存储起来
git stash list  可以看到保存的信息（记住头部：stash@{0}）
git pull        现在就可以开始拉下来了
git stash pop stash@{0} 还原暂存的内容
看提示CONFLICT 这个标志就是冲突的文件，手动解决，
完了之后，上传到远端。

​