TerribleDev/Git-CheatSheet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clarify merge/rebase

Browse Source
This commit is contained in:
Tommy Parnell
2015-07-10 13:12:05 -04:00
parent b2d31d81f8
commit 7c90a98b18
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
readme.md
View File

@@ -32,7 +32,7 @@ merge/rebase a branch into current branch by doing the following
`git fetch --all` (fetch all changes from remote server)
`git merge/rebase origin/BranchNameToMergeFrom` (merge in the changes from the remote branch)
`git merge origin/BranchNameToMergeFrom` OR `git rebase origin/BranchNameToMergeFrom` (merge in the changes from the remote branch)
### Rebase or merge