
@startmindmap
+ git
++ 工作区
+++ 暂存区
++++ 版本库
+ git
++ git init
++ git add
+++ git commit -m " "
++ git status
++ git log
+++ --graph
+++ --pretty=format:"%h %s")
++ git reflog
++ git reset --hard [43f9018]
+ branch
++ git branch
++ git branch [NewBranchName]
++ git branch -d [deleteBranchName]
++ git checkout [BranchName]
++ git checkout master + git merge tobemergedBranch
+ Remote git
++ git init
++ git add fileName
++ git commit -m "commit"
++ git remote add orgin url
++ git push -u origin master
++ git pull origin [BranchName]
+ rebase
++ git rebase -i HEAD~[Number]
++ git rebase -i [commit series number]
++ git rebase master (from dev meger to master)
++ git fetch [dev] + git rebase origin/[dev]
++ confict
+++ solve the confict
+++ git add []
+++ git rebase --continue
@endmindmap