adamzh0u / getgit Goto Github PK

mkdir learngit
cd learngit
pwd

git init 

touch readme.md
git add readme.md
git commit -m "add a markdown file"

git status
git diff readme.md

git add readme.md
git commit -m "change file and diff"
git status

git log # 显示版本
git log --pretty=oneline

git reset --hard HEAD^  ##回退一个版本
git log 

git reset --hard 6983  # 根据hash前几位指定版本

touch license

## change license and readem.md

git status ## 显示工作区 stage 变化
git add readme.md
git status
git add license
git status
git commit

git add readme.md
git add readme.md
git commit ## 多次修改放到暂存区

## change readme.md
123

git checkout -- readme.md

123
git add readme.md
git reset HEAD readme.md 

rm license 
git status

git rm license 
git satus
git commit -m "rm license" ## rm file in folder and in git

rm license 
git checkout -- license ## recover

ssh-keygen -t rsa -C "[email protected]" 

git remote add origin [email protected]:AdamZh0u/GetGit.git ## origin

git push -u origin master ## --upstream 远程origin 

## create branch and switch to
git checkout -b dev 

# or 
git switch -c dev
# or 
git branch dev  ## == git branch -c dev
git checkout dev

touch license
## do changes in license 
git add license 
git commit -m "add license to dev"

## 
git checkout master
git merge # quick merge mode

git branch -d dev

git switch -c dev
## change
git add / git commit -m "switch -c dev"/ git push origin dev

git switch master
## change
git add / git commit -m "change in master branch" / git push

git merge dev ## conflicts
## 手动修改
git add .
git commit -m "fix conflict" / git push 

git log --graph --pretty=oneline --abbrev-commit

git branch -d dev

fork repo1
git clone frepo1
git remote -v # show frepo1
git remote add upstream repo1
git remote -v # show frepo1 repo1

git checkout -b branch master
## changing on branch

git checkout master
git pull upstream master
## pull new changes to local master

git checkout -b branch_new master
git merge branch
git branch -m branch_new branch## rename
git push origin branch

pull request merge branch to master