From a088b0de6cfb2028246f92909aebdbee8672958e Mon Sep 17 00:00:00 2001 From: Bastian Date: Wed, 15 Jan 2020 15:59:12 +0100 Subject: [PATCH] Add branch/merge/rebase visuals --- visualize-git.md | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/visualize-git.md b/visualize-git.md index 9a43245..42e381a 100644 --- a/visualize-git.md +++ b/visualize-git.md @@ -2,8 +2,29 @@ ## commands -git commit -m "message 1" -git commit -m "message 2" -git commit -m "message 3" +### Adding commits +git commit -m "message 1"
+git commit -m "message 2"
+git commit -m "message 3"
+### Creating a branch +git branch feature
+git commit -m "message 4"
+git checkout feature
+git commit -m "message 5"
+git commit -m "message 6"
+git commit -m "message 7"
+git commit -m "message 8"
+ +### Merging with master +git checkout master +git merge feature + +undo + +### Rebase with master +git checkout master +git rebase feature +git checkout feature +git merge