X-Git-Url: http://git.tremily.us/?p=workshop-organization.git;a=blobdiff_plain;f=branch;fp=branch;h=4c4c97c418c74d7508beadd76c071eca658805ff;hp=5ddcde1dcdbf8092f2806eee80a9a330d9bc6774;hb=df05d98143a49f3add37dc916a39f2fc7bacc87a;hpb=67718305363ab05d42ee883303837ebb0d3674cc

diff --git a/branch b/branch
index 5ddcde1..4c4c97c 100644
--- a/branch
+++ b/branch
@@ -86,39 +86,38 @@ workshop branch:
     a       README.md: link to shell, git/basic, and git/advanced
     b       README.md: localize for 2012-12 workshop at my house
 
-If you want to change some of the general content, you have some
-choices.
-
-1. Make your change on the master branch (or the feature branch like
-   “git-wtk”).  Then pull your changes into your workshop branch and
-   make a pull request for inclusion in the master repository.
-
-                  /-a----\---\   typo-fix
-    -o--o--o--o--o--------\---c  origin/master
-      \-o--o      \        \     origin/git-wtk
-            \------o--o--o--b    2012-12-my-workshop
-
-    Figure 3: You can't push to master, so you made a new “typo-fix”
-    branch.  Later on, a SWC dev will merge it into master.  Example log:
-
-    commit  message
-    ------  --------------------------------------------------
-    a       git/basic: fix origin\master -> origin/master typo
-    b       merge recent master branch updates
-    c       git/basic: merge origin\master typo fix
-
-2. If you really want to roll your own content, feel free to skip the
-   master branch entirely.
-
-    -o--o--o--o--o        origin/master
-      \-o--o              origin/git-wtk
-              I--o--o--a  2012-12-my-workshop
-
-    Figure 4: A disjoint branch (2012-12-my-workshop).  The commit “I”
-    has no parents.  Different branches stored in the same repository
-    don't need to share any common commits.  They're still addressing
-    the same goal, and having them in the same repo means its easier
-    to clone/fetch/diff/….
+If you want to change some of the general content, you should make
+your change on the master branch (or the feature branch like
+“git-wtk”).  Then pull your changes into your workshop branch and make
+a pull request for inclusion in the master repository.
+
+                /-a----\---\   typo-fix
+  -o--o--o--o--o--------\---c  origin/master
+    \-o--o      \        \     origin/git-wtk
+          \------o--o--o--b    2012-12-my-workshop
+
+  Figure 3: You can't push to master, so you made a new “typo-fix”
+  branch.  Later on, a SWC dev will merge it into master.  Example
+  log:
+
+  commit  message
+  ------  --------------------------------------------------
+  a       git/basic: fix origin\master -> origin/master typo
+  b       merge recent master branch updates
+  c       git/basic: merge origin\master typo fix
+
+If you really want to roll your own content, feel free to skip the
+master branch entirely.
+
+  -o--o--o--o--o        origin/master
+    \-o--o              origin/git-wtk
+            I--o--o--a  2012-12-my-workshop
+
+  Figure 4: A disjoint branch (2012-12-my-workshop).  The commit “I”
+  has no parents.  Different branches stored in the same repository
+  don't need to share any common commits.  They're still addressing
+  the same goal, and having them in the same repo means its easier to
+  clone/fetch/diff/….
 
 Publishing workshop websites
 ============================