foo.md

Blöcke

(jeder Block ~ 1.5h, insgesamt 2h Pause - ein ganzer Tag git)

0. Intro

   • Why VCS? (Have you ever ...?)
   • Why git?
   • How do I start git very basics

1. Git Commands

   • working dir - index/stage - repo

2. GitLab / GitHub

   • project maintanance
   • issues and PRs
   • "easier collaboration"

3. VCS Workflows

   • how to collaborate in an organized manner

Basics

VCS für mich

config

init

add

git add foo bar

commit

git commit -m 'foo bar'

prima -

was hat sich nu verändert?

log

--stat

-p

diff

• was ändern
• git diff
• git commit -am

repo / stage / working

• grafik raussuchen
• wofür nutzen

add / reset / checkout

diff und diff --staged und diff HEAD

vcs mit backup

• github neues projekt --> projekteinbindung: clone / remote add origin foo
• push
• pull

merge

mergetool linux = meld mac = ??? windows = ???

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