Add d2 git branching demo with rebase
authorbencomp <ben@companjen.name>
Thu, 7 May 2015 13:08:47 +0000 (15:08 +0200)
committerbencomp <ben@companjen.name>
Thu, 7 May 2015 13:08:47 +0000 (15:08 +0200)
git/branching/strategy/d2 [new file with mode: 0644]

diff --git a/git/branching/strategy/d2 b/git/branching/strategy/d2
new file mode 100644 (file)
index 0000000..21f8f54
--- /dev/null
@@ -0,0 +1,22 @@
+git tag tag40
+git checkout -b branch401
+git commit
+git commit
+git checkout -b featureA
+git commit
+git checkout branch401
+git commit
+git checkout master
+git merge branch401
+git tag tag401
+git checkout featureA
+git rebase master
+git commit
+git checkout master
+git merge featureA
+git checkout -b featureB
+git commit
+git commit
+git checkout master
+git merge featureB
+git tag tag402
\ No newline at end of file