Skip to content
Snippets Groups Projects
Commit f5c39097 authored by ck85nori's avatar ck85nori :railway_track:
Browse files

restrukturierung in blöcke 

ansonsten work in progress
parent b22875f5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitignore 0 → 100644
+ 1
− 0
View file @ f5c39097
reveal.js
foo.md
+ 39
− 6
View file @ f5c39097
Prereq Blöcke
====== ======
- github account (jeder Block ~ 1.5h, insgesamt 2h Pause - ein ganzer Tag git)
- local git client installation / eigenes notebook mitbringen
- registration to the course 0. Intro
- bonus: your own project without VCS - 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 Basics
====== ======
...@@ -16,9 +30,15 @@ VCS für mich ...@@ -16,9 +30,15 @@ VCS für mich
### init ### init
### add
git add foo bar
### commit ### commit
- -am --- alarm am geht nicht mit untracked files git commit -m 'foo bar'
prima -
was hat sich nu verändert? was hat sich nu verändert?
-------------------------- --------------------------
...@@ -42,6 +62,8 @@ was hat sich nu verändert? ...@@ -42,6 +62,8 @@ was hat sich nu verändert?
### add / reset / checkout ### add / reset / checkout
diff und diff --staged und diff HEAD
vcs mit backup vcs mit backup
-------------- --------------
...@@ -49,6 +71,14 @@ vcs mit backup ...@@ -49,6 +71,14 @@ vcs mit backup
- push - push
- pull - pull
## merge
mergetool linux = meld
mac = ???
windows = ???
Workflows Workflows
========= =========
...@@ -79,3 +109,6 @@ Your Projects ...@@ -79,3 +109,6 @@ Your Projects
##### STuff ##### STuff
- explain all collaboration workflows via github - explain all collaboration workflows via github
-
git-course.html 0 → 100644
+ 220
− 0
View file @ f5c39097
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="author" content="Christian Krause" />
<meta name="dcterms.date" content="2015-06-15" />
<title>Git Workshop</title>
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="reveal.js/css/reveal.css"/>
<style type="text/css">code{white-space: pre;}</style>
<link rel="stylesheet" href="reveal.js/css/theme/black.css" id="theme" />
<!-- If the query includes 'print-pdf', include the PDF print sheet -->
<script>
if( window.location.search.match( /print-pdf/gi ) ) {
var link = document.createElement( 'link' );
link.rel = 'stylesheet';
link.type = 'text/css';
link.href = 'reveal.js/css/print/pdf.css';
document.getElementsByTagName( 'head' )[0].appendChild( link );
}
</script>
<!--[if lt IE 9]>
<script src="reveal.js/lib/js/html5shiv.js"></script>
<![endif]-->
</head>
<body>
<div class="reveal">
<div class="slides">
<section>
<h1 class="title">Git Workshop</h1>
<h3 class="author">Dirk Sarpe & Christian Krause</h3>
<h3 class="date">today</h3>
<aside class="notes">
<ul>
<li>if you have questions ask them right away</li>
</ul>
</aside>
</section>
<section id="poll-why-are-you-here" class="titleslide slide level1" data-markdown>
<script type="text/template">
# 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.
- Somebody forced you to come here.
- You wanted to get away from your desk for once and maybe take a nap.
</script>
</section>
<section>
<section class="titleslide slide level1" data-markdown>
# What is git, VCS?
-
Note:
-
</section>
<section class="slide level2" data-markdown>
## What is version control?
-
Note:
-
</section>
<section class="slide level2" data-markdown>
## What is git?
-
Note:
-
</section>
<section class="slide level2" data-markdown>
## Why do we all use git?
-
Note:
-
</section>
</section>
<section id="prereq" class="titleslide slide level1" data-markdown>
<script type="text/template">
# 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
</script>
</section>
<section>
<section class="titleslide slide level1" data-markdown>
# Why git?
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?
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?
In these cases, and no doubt others, a version control system should make your life easier.
To misquote a friend: A civilised tool for a civilised age.
-
Note:
-
</section>
<section class="slide level2" data-markdown>
##
-
Note:
-
</section>
</section>
<section>
<section class="titleslide slide level1" data-markdown>
# VCS for me
-
Note:
-
</section>
<section class="slide level2" data-markdown>
##
-
Note:
-
</section>
</section>
<section>
<section class="titleslide slide level1" data-markdown>
#
-
Note:
-
</section>
<section class="slide level2" data-markdown>
##
-
Note:
-
</section>
</section>
<section id="eof" data-background="img/trex.png"><h1>EOF</h1></section>
</div>
</div>
<script src="reveal.js/lib/js/head.min.js"></script>
<script src="reveal.js/js/reveal.js"></script>
<script>
Reveal.initialize({
controls: true,
progress: true,
history: true,
center: true,
maxScale: 1.5,
slideNumber: false,
theme: Reveal.getQueryHash().theme,
transition: Reveal.getQueryHash().transition || 'default',
dependencies: [
{ src: 'reveal.js/lib/js/classList.js', condition: function() { return !document.body.classList; } },
{ src: 'reveal.js/plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
{ src: 'reveal.js/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } },
{ src: 'reveal.js/plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'reveal.js/plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'reveal.js/plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
]
});
</script>
</body>
</html>
img/trex.png 0 → 100644
+ 0
− 0
View file @ f5c39097
img/trex.png

29.1 KiB

ressources.md → resources.md
+ 3
− 0
View file @ f5c39097
...@@ -8,3 +8,6 @@ ...@@ -8,3 +8,6 @@
- session 1 slide 16 Ein typischer Arbeitsablauf - session 1 slide 16 Ein typischer Arbeitsablauf
- session 3 slide: - session 3 slide:
- [Git Big Picture](https://github.com/esc/git-big-picture) might be handy to create overview workflow graphs - [Git Big Picture](https://github.com/esc/git-big-picture) might be handy to create overview workflow graphs
- [visual git guide](http://marklodato.github.io/visual-git-guide/index-en.html)
- [simple git guide](http://rogerdudler.github.io/git-guide/)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment