Updated Branching and Merging (markdown)
parent
6c2e089663
commit
469f938d34
1 changed files with 7 additions and 1 deletions
|
@ -39,4 +39,10 @@ git rebase origin/master
|
||||||
git checkout master
|
git checkout master
|
||||||
git pull
|
git pull
|
||||||
git merge --no-ff your_branch_name
|
git merge --no-ff your_branch_name
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Example
|
||||||
|
|
||||||
|
Here's an example of a commit graph that's easy to follow and understand:
|
||||||
|
|
||||||
|
![http://i.imgur.com/WyKgtTG.png]()
|
Loading…
Reference in a new issue