diff --git a/basics.html b/basics.html
index 9a50491d0d3824183bb2ba850619ad05fb7d25c9..c4a85b4d41e73643c69683153f2895f4d773e4cd 100644
--- a/basics.html
+++ b/basics.html
@@ -20,45 +20,100 @@
<div class="reveal">
<div class="slides">
- <section id="title" data-markdown>
- # git basics
+ <section>
+ <section id="title" data-markdown>
+ # git basics
+ ## for beginner-level git users
- note:
- - if you have questions ask them right away
- - hand out cheat sheets
- </section>
+ notes:
+ - if you have questions ask them right away
+ - hand out cheat sheets later, no need to write stuff down
+ </section>
- <section>
- <section id="intro" data-markdown>
- # intro
+ <section id="intro-objectives" data-markdown>
+ ## objectives
+
+ - teach you to fish
+ - hands-on experience
+ - use version control!
+ - collaborate!
</section>
+ <section id="intro-about-me" data-markdown>
+ ## about me
+
+ - scientific computing support @ idiv since 2014
+ - happy git user since 2010
+
+ > There will never be a better version control system than git.
+ >
+ > -- Christian Krause, Chemnitz 2017
+ </section>
+
+ <section id="intro-about-today" data-markdown>
+ ## about today
+
+ be able to ...
+
+ 1. use git in **ALL** your projects
+ 2. collaborate with each other
+
+ ... that is mission accomplished.
+
+ notes:
+ - there is time for fancy stuff later
+ - take a few weeks getting used to git
+ - delay is good to grow your own experience
+ - growing pain is how we learn
+ </section>
+
+ <section id="intro-you" data-markdown>
+ ## about you
+
+ 
+
+ name, job, git experience, why git?
+ </section>
+
+ <section id="intro-about-git" data-markdown>
+ ## about git
+
+ 1. **records changes to a repository**
+
+ content, who, when, message
+ 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>
+
+ <section>
<section id="motivation" data-markdown>
- ## motivation
+ # motivation
> Why should I use git?
-
- - boss
- - project version history
- - project management
- - show scenarios
</section>
- <section id="intro-motivation-avoid-mess" data-markdown>
+ <section id="motivation-avoid-mess" data-markdown>
## motivation #1
### avoid mess
</section>
- <section id="intro-motivation-want-structure" data-markdown>
+ <section id="motivation-want-structure" data-markdown>
## motivation #1
### want structure
</section>
- <section id="intro-motivation-playground" data-markdown>
+ <section id="motivation-playground" data-markdown>
## motivation #2
### throw-away playgrounds
@@ -72,7 +127,7 @@
- (done right) decision based on regression testing
</section>
- <section id="intro-motivation-collaboration" data-markdown>
+ <section id="motivation-collaboration" data-markdown>
## motivation #3
### collaboration made easy
@@ -82,7 +137,7 @@
notes:
- demo GitLab
- [go to project](https://git.idiv.de/sc/edu/git-seminar)
- - check if still in master
+ - check if typo still in master
- edit
- change **target branch** to create merge request
- commit message:
@@ -93,7 +148,7 @@
```
</section>
- <section id="intro-motivation-creative-use" data-markdown>
+ <section id="motivation-creative-use" data-markdown>
## motivation #4
### the creative use of git award
#### goes to Michael Schilli
@@ -120,7 +175,7 @@
### use version control for
# *everything*
- | common | less frequent | esoteric |
+ | common | less frequent | esoteric? |
| ------------ |:---------------:| ---------------:|
| software | presentation | youtube |
| blog | paper / thesis | soundboard |
@@ -134,34 +189,31 @@
## motivation #a
### automation
- > see advanced seminar
-
- software testing
- build app and deploy to app store
- put presentation on web server
- </section>
-
- <section id="audience" data-markdown>
- ## audience
- - beginner-level git users
+ *(see advanced seminar)*
</section>
+ </section>
- <section id="goals" data-markdown>
- ## goals
+ <section>
+ <section id="start" data-markdown>
+ # let's get started
- - get you started
+ 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 pages
+ - I'm gonna dumb it down for you
+ - aka we'll stick to the simple parts
</section>
<section id="cheatsheet" data-markdown>
# [cheat sheet](https://idiv-biodiversity.github.io/git-cheat-sheet/)
</section>
- </section>
-
- <section>
- <section id="start" data-markdown>
- # let's get started
- </section>
<section id="cli" data-markdown>
## command line
diff --git a/img/people.jpg b/img/people.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a7744cfe4c1c847162cb45d3251609db30ad8988
Binary files /dev/null and b/img/people.jpg differ