new file: git/branching/strategy/demo
authorPhilip Durbin <philipdurbin@gmail.com>
Sun, 19 Apr 2015 13:35:42 +0000 (09:35 -0400)
committerPhilip Durbin <philipdurbin@gmail.com>
Sun, 19 Apr 2015 13:35:42 +0000 (09:35 -0400)
git/branching/strategy/d1 [new file with mode: 0644]
git/branching/strategy/demo [new file with mode: 0755]
git/branching/strategy/o1 [new file with mode: 0644]

diff --git a/git/branching/strategy/d1 b/git/branching/strategy/d1
new file mode 100644 (file)
index 0000000..b941fc4
--- /dev/null
@@ -0,0 +1,31 @@
+git tag tag40
+git checkout -b branch401
+git commit
+git commit
+git checkout -b branch402
+git commit
+git checkout branch401
+git commit
+git checkout master
+git merge branch401
+git tag tag401
+git checkout branch402
+git merge master
+git commit
+git checkout -b branch403
+git commit
+git checkout branch402
+git commit
+git checkout master
+git merge branch402
+git tag tag402
+git checkout branch403
+git merge master
+git commit
+git checkout -b branch404
+git commit
+git checkout branch403
+git commit
+git checkout branch404
+git commit
+git commit
diff --git a/git/branching/strategy/demo b/git/branching/strategy/demo
new file mode 100755 (executable)
index 0000000..73c82ab
--- /dev/null
@@ -0,0 +1,15 @@
+#!/bin/bash
+if [ -z "$1" ]; then
+  echo "Please provide the name of a file with git commands"
+  exit 1
+else
+  STRATEGY=$1
+fi
+OUTPUT=$(echo "http://pcottle.github.io/learnGitBranching/?NODEMO&command=`cat $STRATEGY | sed 's/ /%20/g' | tr '\n' ';'`")
+UNAME=`uname`
+if [[ $UNAME == Linux ]]; then
+    CMD='xdg-open'
+elif [[ $UNAME == Darwin ]]; then
+    CMD='open'
+fi
+$CMD $OUTPUT
diff --git a/git/branching/strategy/o1 b/git/branching/strategy/o1
new file mode 100644 (file)
index 0000000..7899c4c
--- /dev/null
@@ -0,0 +1,32 @@
+git checkout -b branch3x
+git checkout -b branch10
+git commit
+git checkout branch3x
+git checkout -b branch11
+git commit
+git checkout branch3x
+git merge branch10
+git merge branch11
+git checkout -b branch12
+git commit
+git checkout branch3x
+git checkout -b branch13
+git commit
+git checkout branch3x
+git merge branch12
+git merge branch13
+git checkout -b branch324
+git commit
+git tag tag324
+git checkout branch3x
+git commit
+git merge branch324
+git checkout -b branch14
+git commit
+git checkout branch3x
+git merge branch14 
+git checkout -b branch15
+git commit
+git checkout branch3x
+git checkout -b branch16
+git commit