Permalink
Browse files

awwk monolithic commit

  • Loading branch information...
1 parent 84c85b8 commit 5347f499a12bce3ff248de42e698d5ddc1d19145 @catsby committed Apr 27, 2011
Showing with 22 additions and 2 deletions.
  1. +15 −0 intro/01_slide.md
  2. +5 −1 main/01_slide.md
  3. +1 −1 notes.md
  4. +1 −0 showoff.json
View
@@ -10,6 +10,10 @@
**Git-flow** is a set of git **extensions** which provide high-level<br />
repository operations that work according to **Vincent Driessen's branching model.**
+*-translation-*
+
+There is order still in the DVCS chaos
+
!SLIDE center
# Introduction #
@@ -18,6 +22,17 @@ This branching model is widely in use among **teams using git** <br />
as their means of source control, and **serve as a guide** to <br />
developing software in a **managed fashion.**
+
+!SLIDE smbullets incremental truths-slide
+# Truths #
+
+* Git is **decentralized**
+* When working as a team, have a **central "truth" repo**
+* Everyone **pushes** and **pulls** from the **origin**
+* Can also pull from **peers**
+* Or just use **branches** on the origin
+
+
!SLIDE center
# I'm the Map! #
View
@@ -3,13 +3,17 @@
*"A successful Git branching model"*
-!SLIDE transition=scrollLeft center
+!SLIDE transition=scrollLeft center incremental
# Introduction #
**Git-flow** is a set of git **extensions** which provide high-level<br />
repository operations that work according to **Vincent Driessen's branching model.**
+*-translation-*
+
+There is order still in the DVCS chaos
+
!SLIDE center
# Introduction #
View
@@ -20,7 +20,7 @@
- **Develop** reflects on-going development, for the next release, also
called the *Integration Branch*
- **Develop** is where nightly builds come from
-- When **Develop** is stable enough for a release, we make our way down
+- When **Develop** is stable nough for a release, we make our way down
to **Master**
**Supporting Branches**
View
@@ -2,6 +2,7 @@
"name": "Git-Flow",
"sections": [
{"section":"intro"},
+ {"section":"main"},
{"section":"end"}
]
}

0 comments on commit 5347f49

Please sign in to comment.