From cf84a99c9740e41d4f0fbfe3b86e6c82eb838265 Mon Sep 17 00:00:00 2001
From: Christian Krause <christian.krause@idiv.de>
Date: Tue, 5 Apr 2016 17:23:37 +0200
Subject: [PATCH] update

---
 foo.md | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/foo.md b/foo.md
index f5e5d8f..c2bd648 100644
--- a/foo.md
+++ b/foo.md
@@ -1,11 +1,74 @@
 Prereq
 ======
 
+- github account
+- local git client installation / eigenes notebook mitbringen
+- registration to the course
+- bonus: your own project without VCS
+
 Basics
 ======
 
+VCS für mich
+------------
+
+### config
+
+### init
+
+### commit
+
+- -am
+
+was hat sich nu verändert?
+--------------------------
+
+### log
+
+--stat
+
+-p
+
+### diff
+
+### repo / stage / working
+
+### add / reset / checkout
+
+vcs mit backup
+--------------
+
+- github neues projekt --> projekteinbindung: clone / remote add origin foo
+- push
+- pull
+
 Workflows
 =========
 
+branching workflows
+-------------------
+
+was sind branches und wofür brauch ich sie? diese frage sollte eindeutig in diesem kapitel erklärt
+werden.
+
+### nvie successful git branching model
+
+### multi master
+
+paper with many journals
+
+same paper text  -  different theme file for page layout, graph layout, etc.
+
+## tips for papers
+
+git diff -w --ignore-blank-lines --word-diff
+
 Your Projects
 =============
+
+
+
+
+##### STuff
+
+- explain all collaboration workflows via github
-- 
GitLab