A, branch (branch)
1, create a branch
git branch dev
2, branch switching
git branch dev
3, merging branches
git merge bug
4, looking at branches
git branch
5, delete branch
git branch -d bug
Scenario:
Line item in the master branch, branch module being developed in dev
Bug fixes bug on a branch, you modify the bug back to the master branch, and the branch bug and modify merge, delete bug branch,
Switch to the dev branch continues to develop, the development is completed, switch the master branch, merge
Two, stash
1. Development Project (did not finish), occurs bug (required immediately amend bug), did not complete the project to save a special place
git stash
2, finished bug fixes and hosting, back projects under development (most later a)
git stash pop
3, clear the data somewhere
git stash clear
4, all of the data to a hair
git stash list
5, the specified data back
git stash apply coding (git stash list acquired)
6, delete the specified data
git stash drop coding
Note: the general use of branch