Add branch/merge/rebase visuals

This commit is contained in:
Bastian 2020-01-15 15:59:12 +01:00
parent 19c6a020bf
commit a088b0de6c

View File

@ -2,8 +2,29 @@
## commands ## commands
git commit -m "message 1" ### Adding commits
git commit -m "message 2" git commit -m "message 1" <br/>
git commit -m "message 3" git commit -m "message 2" <br/>
git commit -m "message 3" <br/>
### Creating a branch
git branch feature <br/>
git commit -m "message 4" <br/>
git checkout feature <br/>
git commit -m "message 5" <br/>
git commit -m "message 6" <br/>
git commit -m "message 7" <br/>
git commit -m "message 8" <br/>
### Merging with master
git checkout master
git merge feature
undo
### Rebase with master
git checkout master
git rebase feature
git checkout feature
git merge