1.5 merge\rebase\revert\stash\branch

1、git merge <branch> Merging branches

git checkout master // The current branch is master

git branch test  // With master As the base , newly build test Branch 

git checkout test // Check out the test Branch , Modify the content 

git checkout master // Check out the master Branch 

git merge test// hold test Branch into master Branch 

2、git pull / git fetch

git pull origin master:test // Pull remote master Branch , Merge into local test Branch 

 Equate to 

git fetch origin master

git merge FETCH_HEAD

3、git rebase

git rebase master // Variable base , Up-to-date master Branch based , Pull the code and merge it into the local branch 

 Equate to 

git pull -r origin master 

 or 

git pull -rebase origin master

4、git revert

// General withdrawal , A new submission record will be generated 

git revert <commitId>


/*
* merge commit  withdraw 
* merge commit There will be two. parent commitId
*  Represents which two commitId The merger of 
*  therefore -m The value of is 1 or 2, It means which submission to keep 
**/
git revert <commitId> -m 1


//revert Then proceed in the current branch merge, Was previously revert The file will not be merge Come in 

//master Branch merging release Branch , after revert,release After the branch is modified ,master Cannot merge in release Branching problem 

git branch test   // stay master Pull a new one test Branch 

git checkout test  // Check out the test Branch 

git show   // see commit Record 

git revert <commitId>  //  stay test To execute on a branch revert operation 

git merge release  // stay test On branch merge release

git checkout master  // Check out the master

git merge test  // stay master On branch merge test

git branch -d test // Delete test Branch 

5、git branch

git branch test // New branch 

git branch // View local branch 

git branch -r // View remote branches 

git push origin -d <branchName> // Delete remote branch 

git branch -d <branchName> // Delete local branch 

6、git stash

Archive staging area and workspace

git stash save test1 // Newly added code and commit Of , Will be temporarily saved 

git stash list  // View the saved history list 

git stash pop 0 // Restore temporarily saved content , If the recovery record is not specified , The latest saved record will be restored by default 

git stash apply 0 // You can use , Restore the saved records to other branches 

git stash drop 0 // Clear the specified record 

git stash clear // Clear all stored records 

git stash show  // Check the difference between the stored record and the current file 

git stash show 0 // View the difference between the specified storage record and the current file 

git stash show 0 -p // See the detailed differences 

git stash branch <branchName> 0 // According to a storage record , Pull a new branch , For manual conflict resolution