Skip to content
Snippets Groups Projects
Commit d052f1e2 authored by Laurent Heirendt's avatar Laurent Heirendt :airplane:
Browse files

First draft version

parent 71588fbc
No related branches found
No related tags found
1 merge request!1First draft version
Hide whitespace changes
Inline Side-by-side
img/gray-linen-background-texture_58348.jpg 0 → 100644
+ 0
− 0
View file @ d052f1e2
img/gray-linen-background-texture_58348.jpg

170 KiB

img/sbgBackground.jpg 0 → 100644
+ 0
− 0
View file @ d052f1e2
img/sbgBackground.jpg

1.08 MiB

index.html
+ 9
− 9
View file @ d052f1e2
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Débuter avec Git et Github</title> <title>Basic git training</title>
<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<section data-separator="^\n\n\n" <section data-separator="^\n\n\n"
data-vertical="^\n\n" data-vertical="^\n\n"
data-background="http://25.media.tumblr.com/b03e53931e2264f97a3e93beae6d3053/tumblr_mtw7hple1a1st5lhmo1_1280.jpg" data-markdown="slides/index.md"></section> data-background="../img/sbgBackground.jpg" data-markdown="slides/index.md"></section>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<section data-separator="^\n\n\n" <section data-separator="^\n\n\n"
data-vertical="^\n\n" data-vertical="^\n\n"
data-background="http://farm5.staticflickr.com/4122/4735516686_62ae6eb0f8_b.jpg" data-markdown="slides/part-2-git-intro.md"></section> data-background="../img/gray-linen-background-texture_58348.jpg" data-markdown="slides/part-2-git-intro.md"></section>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<section data-separator="^\n\n\n" <section data-separator="^\n\n\n"
data-vertical="^\n\n" data-vertical="^\n\n"
data-background="http://farm7.staticflickr.com/6128/5932561907_c325e9b981_b.jpg" data-markdown="slides/part-3-installation.md"></section> data-background="../img/gray-linen-background-texture_58348.jpg" data-markdown="slides/part-3-installation.md"></section>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<section data-separator="^\n\n\n" <section data-separator="^\n\n\n"
data-vertical="^\n\n" data-vertical="^\n\n"
data-background="img/dark.jpg" data-markdown="slides/part-4-first-repo.md"></section> data-background="../img/gray-linen-background-texture_58348.jpg" data-markdown="slides/part-4-first-repo.md"></section>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<section data-separator="^\n\n\n" <section data-separator="^\n\n\n"
data-vertical="^\n\n" data-vertical="^\n\n"
data-background="img/dark.jpg" data-markdown="slides/part-5-branches.md"></section> data-background="../img/gray-linen-background-texture_58348.jpg" data-markdown="slides/part-5-branches.md"></section>
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<section data-separator="^\n\n\n" <section data-separator="^\n\n\n"
data-vertical="^\n\n" data-vertical="^\n\n"
data-background="img/dark.jpg" data-markdown="slides/part-6-remote.md"></section> data-background="../img/gray-linen-background-texture_58348.jpg" data-markdown="slides/part-6-remote.md"></section>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<section data-separator="^\n\n\n" <section data-separator="^\n\n\n"
data-vertical="^\n\n" data-vertical="^\n\n"
data-background="img/dark.jpg" data-markdown="slides/part-7-github-pages.md"></section> data-background="../img/gray-linen-background-texture_58348.jpg" data-markdown="slides/part-7-github-pages.md"></section>
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
<section data-separator="^\n\n\n" <section data-separator="^\n\n\n"
data-vertical="^\n\n" data-vertical="^\n\n"
data-background="http://24.media.tumblr.com/da6bdeb8f4e2e4104b539e5ad755c1cf/tumblr_muuhikhivh1st5lhmo1_1280.jpg" data-markdown="slides/part-8-thanks.md"></section> data-background="../img/gray-linen-background-texture_58348.jpg" data-markdown="slides/part-8-thanks.md"></section>
......
slides/index.md
+ 47
− 3
View file @ d052f1e2
<img src="img/lewagon.png" class="as-is" height="50" /> # <img src="img/git_logo.png" class="as-is"> training
# Starting with Git ##SBG and MSP groups
##(and Github)
LCSB
<br><br><br><br>
<br><br><br><br>
January 19th, 2017
Sylvain Arreckx & Laurent Heirendt
<br><br><br><br>
note:
(**Tuesday**: verify that everybody has a working computer with git installed)
Verify that everyone has a GitHub and a Gitlab account
**Thursday**: interactive session
˜/work/training/cobratoolbox
1. Git (on GitHub and GitLab)
Init (git-r3 / graphique)
clone, add, commit, (diff, log), push and status
branch, checkout (add commit push on a branch)
Demo that if pushed to a branch, we will have a conflict -> submit a PR tto DEVELOP from own branch to avoid that
2. Github
Explain interface
Fork, update the fork
PR, issues (on a dummy test repo)
**Thursday**: Home exercise (30 min)
- Task 1a: Create a function with documentation
- Task 1b: test
- Task 2: Push to forked repo and create a PR
- Bonus Task: Fork the cobratoolbox and update
- Friday: 1h debriefing
slides/list.json
+ 8
− 8
View file @ d052f1e2
...@@ -2,49 +2,49 @@ ...@@ -2,49 +2,49 @@
{ {
"filename": "index.md", "filename": "index.md",
"attr": { "attr": {
"data-background": "http://25.media.tumblr.com/b03e53931e2264f97a3e93beae6d3053/tumblr_mtw7hple1a1st5lhmo1_1280.jpg" "data-background": "../img/sbgBackground.jpg"
} }
}, },
{ {
"filename": "part-2-git-intro.md", "filename": "part-2-git-intro.md",
"attr": { "attr": {
"data-background": "http://farm5.staticflickr.com/4122/4735516686_62ae6eb0f8_b.jpg" "data-background": "../img/gray-linen-background-texture_58348.jpg"
} }
}, },
{ {
"filename": "part-3-installation.md", "filename": "part-3-installation.md",
"attr": { "attr": {
"data-background": "http://farm7.staticflickr.com/6128/5932561907_c325e9b981_b.jpg" "data-background": "../img/gray-linen-background-texture_58348.jpg"
} }
}, },
{ {
"filename": "part-4-first-repo.md", "filename": "part-4-first-repo.md",
"attr": { "attr": {
"data-background": "img/dark.jpg" "data-background": "../img/gray-linen-background-texture_58348.jpg"
} }
}, },
{ {
"filename": "part-5-branches.md", "filename": "part-5-branches.md",
"attr": { "attr": {
"data-background": "img/dark.jpg" "data-background": "../img/gray-linen-background-texture_58348.jpg"
} }
}, },
{ {
"filename": "part-6-remote.md", "filename": "part-6-remote.md",
"attr": { "attr": {
"data-background": "img/dark.jpg" "data-background": "../img/gray-linen-background-texture_58348.jpg"
} }
}, },
{ {
"filename": "part-7-github-pages.md", "filename": "part-7-github-pages.md",
"attr": { "attr": {
"data-background": "img/dark.jpg" "data-background": "../img/gray-linen-background-texture_58348.jpg"
} }
}, },
{ {
"filename": "part-8-thanks.md", "filename": "part-8-thanks.md",
"attr": { "attr": {
"data-background": "http://24.media.tumblr.com/da6bdeb8f4e2e4104b539e5ad755c1cf/tumblr_muuhikhivh1st5lhmo1_1280.jpg" "data-background": "../img/gray-linen-background-texture_58348.jpg"
} }
} }
] ]
slides/part-1-about-vcs.md deleted 100644 → 0
+ 0
− 0
View file @ 71588fbc
slides/part-2-git-intro.md
+ 20
− 12
View file @ d052f1e2
<img src="img/git_logo.png" class="as-is" /> # Overview
note: 1. What is `git`? Why do I need it? (5 min)
Put your speaker notes here. 2. GitHub and GitLab (5min)
You can see them pressing 's'. * Practical session (5 min)
3. The 5 essential commands (10 min)
* Practical session (15 min)
4. Branches (10 min)
* Practical session (10 min)
5. Forks (10 min)
* Practical session (10 min)
6. Evaluation (10 min)
## Origin ## What is `git`? Why do I need it?
![](img/linus.jpg) ![](img/linus.jpg)
Designed and implemented in 2005 by **Linus Torvalds** Designed and implemented in 2005 by **Linus Torvalds**
![](img/git_definition.png) ![](img/git_definition.png)
note:
I'm an egotistical bastard, and I name all my projects after myself.
First Linux, now git.
## Décentralisé ## The 5 essential commands
## Rapide
## Performant `pull, status, add, commit, push` (P-SAC-P)
note:
Put your speaker notes here.
You can see them pressing 's'.
Fullscreen can be activated by typing 'f'.
slides/part-4-first-repo.md
+ 2
− 2
View file @ d052f1e2
# Les bases # The 5 commands
## Mon premier dépôt ## Mon premier dépôt
...@@ -142,4 +142,4 @@ $ git status ...@@ -142,4 +142,4 @@ $ git status
<img src="img/git-5-reset.png" class="as-is" /> <img src="img/git-5-reset.png" class="as-is" />
## Rinse and Repeat ## Rinse and Repeat
\ No newline at end of file
templates/_index.html
+ 1
− 1
View file @ d052f1e2
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Débuter avec Git et Github</title> <title>Basic git training</title>
<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment