nächster wip step

0-Intro.md

@@ -22,11 +22,13 @@ To misquote a friend: A civilised tool for a civilised age.
 by si618 at [https://stackoverflow.com/a/1408464](https://stackoverflow.com/a/1408464)
 
 ### Does this look familiar?
+
 Picture with many draft versions.
 
 Punchline: Not only for code.
 
 ### A VCS gives you a history of your project:
+
 * dcad3f8 add table captions for fwb
 * 92531e7 figure captions for fwb
 * 5129bdd adapted figure to fig for fwb and minor

foo.md

@@ -38,7 +38,7 @@ git add foo bar
 
 git commit -m 'foo bar'
 
-prima - 
+prima -
 
 was hat sich nu verändert?
 --------------------------

git-course.html

@@ -35,7 +35,6 @@
         <section>
           <h1 class="title">Git Workshop</h1>
           <h3 class="author">Dirk Sarpe & Christian Krause</h3>
-          <h3 class="date">today</h3>
 
           <aside class="notes">
             <ul>
@@ -45,99 +44,230 @@
         </section>
 
         <section id="poll-why-are-you-here" class="titleslide slide level1" data-markdown>
-          <script type="text/template">
-            # Poll: Why are you here?
+          ## Poll
+          # Why are you here?
 
-            Note:
-            - Someone (like us) told you it ~~might be~~ **is** useful.
-            - You never took the time to really learn it.
-            - You already know and use it, want to show off / learn new tricks.
+          Note:
+          - Someone (like us) told you it ~~might be~~ **is** useful.
+          - You never took the time to really learn it.
+          - You already know and use it, want to show off / learn new tricks.
+
+          - Somebody forced you to come here.
+          - You wanted to get away from your desk for once and maybe take a nap.
+        </section>
 
-            - Somebody forced you to come here.
-            - You wanted to get away from your desk for once and maybe take a nap.
-          </script>
+        <section id="outline" class="titleslide slide level1" data-markdown>
+          # Outline
+
+          1. Intro
+          2. Git Commands
+          3. GitLab / GitHub
+          4. Workflows
+
+          Note:
+          - jeder Block ~ 1.5h
+          - insgesamt 2h mit Pause
+          - 8h - ein ganzer Tag git
+          - ein-satz-beschreibungen zu den abschnitten
+            - 0. why vcs, why git, getting started with git
+            - 1. git basics
+            - 2. web collaboration tools
+            - 3. how to collaborate in organized manner
         </section>
 
         <section>
           <section class="titleslide slide level1" data-markdown>
-            # What is git, VCS?
+            ## Block 1
+            # Introduction
 
-            - 
+            Note:
+            - quickly talk about block outline
+              - why vcs? why git?
+              - installation git client
+              - setup GitLab / GitHub accounts
+              - getting started with git (try git)
+          </section>
+
+          <section class="slide level2" data-markdown>
+            ### Have you ever seen this?
+
+            ![foo](img/draft_mess.png)
 
             Note:
-            - 
+            - Dirk erklärt seine mess
+            - wouldn't it be nicer to have
           </section>
 
           <section class="slide level2" data-markdown>
-            ## What is version control?
+            ### wouldn't it be nicer to have
+            # version control
 
-            - 
+            ```
+            Dirk Sarpe         14 minutes ago   fix reference
+            Dirk Sarpe         5 days ago       adapt figures to nature
+            Christian Krause   6 days ago       add figure captions
+            Dirk Sarpe         7 weeks ago      adds mean values to analysis
+            Christian Krause   7 weeks ago      adds abstract
+            ```
 
             Note:
-            - 
+            - git log --pretty=format'%an %ar %s'
+            - and as you can see not only for source code
           </section>
 
           <section class="slide level2" data-markdown>
-            ## What is git?
+            ## have you ever ...
+
+            - review history (see diff)
+            - wanted to go back in time
+            - maintain multiple versions
+              - hint: for different journals
+              - try things out without breaking what works
 
+            Note:
             - 
+          </section>
+
+          <section class="slide level2" data-markdown>
+            ## have you ever ...
+
+            - collaborate
+            - who made that error
+            - see project progress
+            - lost code (no backup)
 
             Note:
             - 
           </section>
 
           <section class="slide level2" data-markdown>
-            ## Why do we all use git?
+            # yes?
 
+            Note:
             - 
+          </section>
+
+          <section class="slide level2" data-markdown>
+            # use vcs!
 
             Note:
             - 
           </section>
         </section>
 
-        <section id="prereq" class="titleslide slide level1" data-markdown>
-          <script type="text/template">
-            # Checking Prerequisites
+        <section>
+          <section class="titleslide slide level1" data-markdown>
+            ## Block 1
+            # git
 
-            - GitHub / GitLab account
-            - local git client installation
-            - bonus: your own project without VCS
+            Note:
+            - 
+          </section>
+
+          <section class="titleslide slide level1" data-markdown>
+            ![git](img/what-is-git.jpg)
 
             Note:
-            - wenn git client selbst nicht aufsetzen kann, dann bitte halbe stunde früher
-            - registration to the course
-            - git client includes your own notebook
-          </script>
-        </section>
+            - 
+          </section>
 
-        <section>
           <section class="titleslide slide level1" data-markdown>
-            # Why git?
+            ![git](img/what-is-git-answer.jpg)
 
-Have you ever:
+            Note:
+            - 
+          </section>
 
-    Made a change to code, realised it was a mistake and wanted to revert back?
-    Lost code or had a backup that was too old?
-    Had to maintain multiple versions of a product?
-    Wanted to see the difference between two (or more) versions of your code?
-    Wanted to prove that a particular change broke or fixed a piece of code?
-    Wanted to review the history of some code?
-    Wanted to submit a change to someone else's code?
-    Wanted to share your code, or let other people work on your code?
-    Wanted to see how much work is being done, and where, when and by whom?
-    Wanted to experiment with a new feature without interfering with working code?
+          <section class="titleslide slide level1" data-markdown>
+            ![git](img/say-what.jpg)
+
+            Note:
+            - 
+          </section>
 
-In these cases, and no doubt others, a version control system should make your life easier.
+          <section class="titleslide slide level1" data-markdown>
+            ## what is git? (2nd try)
+            ### seriously
 
-To misquote a friend: A civilised tool for a civilised age.
+            # TODO image gitk all, visual representation of git parent child tree with remotes,
+            tags, good commit messages, etc. mit local change der remote noch nicht da ist
 
+            Note:
+            - am bild dvcs erklären!
+          </section>
+
+          <section class="slide level2" data-markdown>
+            ![git](img/idontalwaysusevcs.jpg)
+
+            Note:
             - 
+          </section>
+
+          <section class="slide level2" data-markdown>
+            ## Why do we all use git?
+
+            #### non-technical
+
+            - any workflow
+            - collaboration
+            - experimentation
+            - undo mistakes
+            - state of the art (best tool for the job)
+            - all the cool kids do it
 
             Note:
             - 
           </section>
 
+          <section class="slide level2" data-markdown>
+            ## Why do we all use git?
+
+            #### technical
+
+            - never lose data (not just remote but also file integrity)
+            - easy conflict resolution
+            - local (your own copy of everything)
+            - implies speedy gonzales
+
+            Note:
+            - 
+          </section>
+        </section>
+      </section>
+
+      <section>
+        <section id="prereq" class="titleslide slide level1" data-markdown>
+          ### Block 1
+          ## Git Demo
+
+          Note:
+          - vorher fragen, wer alles client braucht und noch accounts braucht, damit wir wissen,
+          wieviel zeit wir uns für try git nehmen können
+          - config
+          - init
+          - git add foo bar
+          - git commit -m 'foo bar'
+          - prima
+        </section>
+      </section>
+
+      <section>
+        <section id="prereq" class="titleslide slide level1" data-markdown>
+          ### Block 1
+          ## Checking Prerequisites
+
+          - GitHub / GitLab account
+          - local git client installation
+          - bonus: your own project without VCS
+
+          Note:
+          - wenn git client selbst nicht aufsetzen kann, dann bitte halbe stunde früher
+          - registration to the course
+          - git client includes your own notebook
+        </section>
+      </section>
+
+
           <section class="slide level2" data-markdown>
             ##