From 85aa8cd736398268c6692a56a4eb192480ca0193 Mon Sep 17 00:00:00 2001
From: Christian Krause <christian.krause@idiv.de>
Date: Wed, 10 Oct 2018 12:02:58 +0200
Subject: [PATCH] improves intro section
---
basics.html | 54 ++++++++++++++++++++++++++++-------------------------
1 file changed, 29 insertions(+), 25 deletions(-)
diff --git a/basics.html b/basics.html
index dcc3598..813f04f 100644
--- a/basics.html
+++ b/basics.html
@@ -29,9 +29,9 @@
## for beginner-level git users
notes:
- - if you have questions ask them right away
- - hand out cheat sheets later, no need to write stuff down
- close your laptops
+ - hand out cheat sheets later, no need to write stuff down
+ - if you have questions feel free to interrupt
</section>
<section id="intro-objectives" data-markdown>
@@ -43,6 +43,31 @@
- collaborate!
</section>
+ <section id="intro-version-control" data-markdown>
+ ## about version control
+
+ > records changes
+
+ what, who, when, why
+ </section>
+
+ <section id="intro-about-git" data-markdown>
+ ## about git
+
+ ### best tool for the job
+
+ - simple by design
+ - powerful if needed
+ - documentation
+ - industry standard
+
+ notes:
+ - git name: "the stupid content tracker"
+ - today we talk about the simple parts
+ - powerful parts in advanced course
+ - doc: also means community / stackoverflow entries
+ </section>
+
<section id="intro-about-today" data-markdown>
## about today
@@ -119,22 +144,6 @@
- who, when, why
</section>
- <section id="motivation-want-structure" data-markdown>
- ## about git
-
- 1. **records changes to a *repository***
-
- content, who, when, why
- 2. **best tool for the job**
-
- technical, usability, community
-
- notes:
- - the fact that content is organized in files and directories is
- only incidental
- - for git to be useful, content has to be text
- </section>
-
<section id="motivation-playground" data-markdown>
## motivation #2
### throw-away playgrounds
@@ -248,13 +257,8 @@
# setup
notes:
- - git is simple and complex
- - git seems complex for 2 reasons:
- - you're unfamiliar with command line
- - there are a lot of choices
- - only X (TODO) theory/internals pages
- - I'm gonna dumb it down for you
- - aka we'll stick to the simple parts
+ - installation
+ - configuration
</section>
<section id="setup-cli" data-markdown>
--
GitLab