diff --git a/img/gray-linen-background-texture_58348.jpg b/img/gray-linen-background-texture_58348.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..42d70c58e51fded30a31380a1d204248c2a6b047
Binary files /dev/null and b/img/gray-linen-background-texture_58348.jpg differ
diff --git a/img/sbgBackground.jpg b/img/sbgBackground.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1851c11bf75388ced31e2f1fe22a19eb3a5f00d9
Binary files /dev/null and b/img/sbgBackground.jpg differ
diff --git a/index.html b/index.html
index 7877825d636f39358cd61db50bab6d161d7ba672..2d0b283c170c1464450a0304a963b09deb2392b0 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
<head>
<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-status-bar-style" content="black-translucent" />
@@ -43,7 +43,7 @@
<section data-separator="^\n\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 @@
<section data-separator="^\n\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 @@
<section data-separator="^\n\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 @@
<section data-separator="^\n\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 @@
<section data-separator="^\n\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 @@
<section data-separator="^\n\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 @@
<section data-separator="^\n\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 @@
<section data-separator="^\n\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>
diff --git a/slides/index.md b/slides/index.md
index 3ed9e54c241dcd8fc3c95d0660a69dbb49bab63a..17c5ffd081585317c1181ef865308bfcc4c321bb 100644
--- a/slides/index.md
+++ b/slides/index.md
@@ -1,4 +1,48 @@
-<img src="img/lewagon.png" class="as-is" height="50" />
+# <img src="img/git_logo.png" class="as-is"> training
-# Starting with Git
-##(and Github)
+##SBG and MSP groups
+
+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
diff --git a/slides/list.json b/slides/list.json
index 073897e0067cd04d80f2e8f253100798aa3cbc32..0d97833749be2502e8cc54384879dfc300ff8fb0 100644
--- a/slides/list.json
+++ b/slides/list.json
@@ -2,49 +2,49 @@
{
"filename": "index.md",
"attr": {
- "data-background": "http://25.media.tumblr.com/b03e53931e2264f97a3e93beae6d3053/tumblr_mtw7hple1a1st5lhmo1_1280.jpg"
+ "data-background": "../img/sbgBackground.jpg"
}
},
{
"filename": "part-2-git-intro.md",
"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",
"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",
"attr": {
- "data-background": "img/dark.jpg"
+ "data-background": "../img/gray-linen-background-texture_58348.jpg"
}
},
{
"filename": "part-5-branches.md",
"attr": {
- "data-background": "img/dark.jpg"
+ "data-background": "../img/gray-linen-background-texture_58348.jpg"
}
},
{
"filename": "part-6-remote.md",
"attr": {
- "data-background": "img/dark.jpg"
+ "data-background": "../img/gray-linen-background-texture_58348.jpg"
}
},
{
"filename": "part-7-github-pages.md",
"attr": {
- "data-background": "img/dark.jpg"
+ "data-background": "../img/gray-linen-background-texture_58348.jpg"
}
},
{
"filename": "part-8-thanks.md",
"attr": {
- "data-background": "http://24.media.tumblr.com/da6bdeb8f4e2e4104b539e5ad755c1cf/tumblr_muuhikhivh1st5lhmo1_1280.jpg"
+ "data-background": "../img/gray-linen-background-texture_58348.jpg"
}
}
]
diff --git a/slides/part-1-about-vcs.md b/slides/part-1-about-vcs.md
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/slides/part-2-git-intro.md b/slides/part-2-git-intro.md
index 7888db4e1622b7288a78fbc87c7caf2222270c43..c73cbb7bb423ccbd2abcc7afc6faa691be61f7d8 100644
--- a/slides/part-2-git-intro.md
+++ b/slides/part-2-git-intro.md
@@ -1,23 +1,31 @@
-<img src="img/git_logo.png" class="as-is" />
+# Overview
-note:
- Put your speaker notes here.
- You can see them pressing 's'.
+1. What is `git`? Why do I need it? (5 min)
+2. GitHub and GitLab (5min)
+ * 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?
Designed and implemented in 2005 by **Linus Torvalds**
-
-note:
- I'm an egotistical bastard, and I name all my projects after myself.
- First Linux, now git.
-## Décentralisé
-## Rapide
-## Performant
+## The 5 essential commands
+
+`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'.
diff --git a/slides/part-4-first-repo.md b/slides/part-4-first-repo.md
index 14f405e2bf72b4e8be3f226ebbde006d03bea584..b87b25f026044fd04aec047cb0f8479de28ce363 100644
--- a/slides/part-4-first-repo.md
+++ b/slides/part-4-first-repo.md
@@ -1,4 +1,4 @@
-# Les bases
+# The 5 commands
## Mon premier dépôt
@@ -142,4 +142,4 @@ $ git status
<img src="img/git-5-reset.png" class="as-is" />
-## Rinse and Repeat
\ No newline at end of file
+## Rinse and Repeat
diff --git a/templates/_index.html b/templates/_index.html
index 24d02f0aee4ab45b090ea10b308ba97dbc08cd3b..2a26344b0ce15e66a25635f0dd62bc7f4a74c23e 100644
--- a/templates/_index.html
+++ b/templates/_index.html
@@ -4,7 +4,7 @@
<head>
<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-status-bar-style" content="black-translucent" />