From 4115c29ba3868a0b7b8313bdd026ec8133119dcc Mon Sep 17 00:00:00 2001
From: Dirk Sarpe <dirk.sarpe@idiv.de>
Date: Wed, 14 Sep 2016 08:14:03 +0200
Subject: [PATCH] rewrite introductory block

Add installation to block, as we start at 0.
Less focus on reasons why to use git (already in git-commercial presentation).
Recognize that git in windows can be used in a bash like environment.
---
 0-Intro.md | 99 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 85 insertions(+), 14 deletions(-)

diff --git a/0-Intro.md b/0-Intro.md
index 6e0b97c..552f54d 100644
--- a/0-Intro.md
+++ b/0-Intro.md
@@ -1,8 +1,37 @@
 # Introduction to git - a powerful version control system
 
-## Why would you want to use a VCS?
+## block structure
+- Why git?
+    - poll from registration
+    - other points from our list
+- git installation hands on
+    - git on the command line
+    - navigate manipulate on cli
+	-  ls, pwd, cd, mv, rm, cp, mkdir, rmdir
+- short break (optional)
+- (like) try git on beamer (closed laptops)
+    - try git would be 1.1 to 1.9
+    - init
+    - status
+    - add
+    - commit
+    - log (metadata only)
+- short break (optional)
+- hands on - created project
+    - multiple commits
+    - multiple files
+    - diff
+    - log (with patch)
+- wrap up hands on
+    - problems that occurred
+    - conclusion
 
-### Have you ever:
+## Why git?
+### Why would you want to use a VCS, e.g. git?
+- Summary of answers to question from registration.
+- git helps you to keep an overview of a project.
+
+### Thoughts from the net “Have you ever:”
 
 - 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?
@@ -21,20 +50,62 @@ 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.
+## git installation hands on
+[instructions](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
+
+### installation on ubuntu
+We will use the version from the git ppa:
+```bash
+sudo apt-get install ppa-purge
+sudo add-apt-repository ppa:git-core/ppa
+sudo apt-get update
+sudo apt-get dist-upgrade
+sudo apt-get install git
+```
+
+### installation on windows
+[git project page](https://git-scm.com/)
+
+### navigate and manipulate on cli
+- pwd
+- ls
+- cd
+- mv
+- rm
+- cp
+- mkdir
+- rmdir
+
+
+### configure git
+```bash
+git config --global user.name "Your Name"
+git config --global user.email "your.name@idiv.de"
+```
+- eventually additionally configuration for windows/linux/mac stuff
+- eventually mention difference global local
+
+## short break (optional)
 
-Punchline: Not only for code.
+## show try git like tutorial on beamer (closed laptops)
+- try git would be 1.1 to 1.9
+- create project directory
+- init
+- status
+- add
+- commit
+- log (metadata only)
 
-### A VCS gives you a history of your project:
+## short break (optional)
 
-* dcad3f8 add table captions for fwb
-* 92531e7 figure captions for fwb
-* 5129bdd adapted figure to fig for fwb and minor
-* fff1924 minor: fix reference name
-* dda1e33 adapt abstract to numbered fwb summary
-* d2f46d3 compare real TCI and our TCI
-* 35787b1 some mean values we need to report
-* 6af0b79 denser conclusion
+## hands on - created project
+- multiple commits
+- multiple files
+- diff
+- log (with patch)
+- test this with a windows and mac machine to see things like editor, linebreaks, etc.
 
+## wrap up hands on
+- problems that occurred
+- conclusion
-- 
GitLab