diff --git a/index.html b/index.html index cfa6f715589367a928bfc137a3e4d2c64c7df42e..4e2459e2b7e0435adcd7e102a766f1fa882183c7 100644 --- a/index.html +++ b/index.html @@ -71,6 +71,16 @@ + <section data-separator="^\n\n\n" + data-vertical="^\n\n" + data-markdown="slides/what_is_git.md"></section> + + + + + + + <section data-separator="^\n\n\n" data-vertical="^\n\n" data-markdown="slides/installation.md"></section> @@ -83,7 +93,7 @@ <section data-separator="^\n\n\n" data-vertical="^\n\n" - data-markdown="slides/part-4-first-repo.md"></section> + data-markdown="slides/essential_commands.md"></section> @@ -93,7 +103,7 @@ <section data-separator="^\n\n\n" data-vertical="^\n\n" - data-markdown="slides/part-5-branches.md"></section> + data-markdown="slides/github_gitlab.md"></section> @@ -103,7 +113,7 @@ <section data-separator="^\n\n\n" data-vertical="^\n\n" - data-markdown="slides/part-6-remote.md"></section> + data-markdown="slides/branches.md"></section> @@ -113,7 +123,7 @@ <section data-separator="^\n\n\n" data-vertical="^\n\n" - data-markdown="slides/part-7-github-pages.md"></section> + data-markdown="slides/forks.md"></section> @@ -123,7 +133,7 @@ <section data-separator="^\n\n\n" data-vertical="^\n\n" - data-markdown="slides/part-8-thanks.md"></section> + data-markdown="slides/thanks.md"></section> diff --git a/slides/part-5-branches.md b/slides/branches.md similarity index 100% rename from slides/part-5-branches.md rename to slides/branches.md diff --git a/slides/part-4-first-repo.md b/slides/essential_commands.md similarity index 90% rename from slides/part-4-first-repo.md rename to slides/essential_commands.md index 6b26b7e396d292dfee116aab94a1df4dd27ece02..15e217d7db00a720004fcf12a9e3edcb877ed077 100644 --- a/slides/part-4-first-repo.md +++ b/slides/essential_commands.md @@ -1,4 +1,12 @@ -## The 5 commands +## The 5 essential commands + +`pull, status, add, commit, push` + +note: + Put your speaker notes here. + You can see them pressing 's'. + Fullscreen can be activated by typing 'f'. + ```shell $ git init diff --git a/slides/part-6-remote.md b/slides/forks.md similarity index 100% rename from slides/part-6-remote.md rename to slides/forks.md diff --git a/slides/github_gitlab.md b/slides/github_gitlab.md new file mode 100644 index 0000000000000000000000000000000000000000..a2789c90d65c8a6c9510f874406a51a6b4a87754 --- /dev/null +++ b/slides/github_gitlab.md @@ -0,0 +1 @@ +## GitHub and GitLab diff --git a/slides/installation.md b/slides/installation.md index fa674ceed0b81524a8e3434145d461127c4cd574..8808ed3332145ffffd846907f1f9490987e84f1d 100644 --- a/slides/installation.md +++ b/slides/installation.md @@ -18,5 +18,5 @@ $ git config -l ```shell $ git --version -# git version 1.8.5 +# git version 2.10.0 ``` diff --git a/slides/list.json b/slides/list.json index b6f53836baaf02f3912598f0623edc104bce7b9f..34747f851205d8137b27fde4d812f067fb60b6e1 100644 --- a/slides/list.json +++ b/slides/list.json @@ -15,33 +15,38 @@ "attr": { } }, + { + "filename": "what_is_git.md", + "attr": { + } + }, { "filename": "installation.md", "attr": { } }, { - "filename": "part-4-first-repo.md", + "filename": "essential_commands.md", "attr": { } }, { - "filename": "part-5-branches.md", + "filename": "github_gitlab.md", "attr": { } }, { - "filename": "part-6-remote.md", + "filename": "branches.md", "attr": { } }, { - "filename": "part-7-github-pages.md", + "filename": "forks.md", "attr": { } }, { - "filename": "part-8-thanks.md", + "filename": "thanks.md", "attr": { } } diff --git a/slides/overview.md b/slides/overview.md index 90818dc7d4e3c3c4a1a162d1c994c44f84fcbd60..1ab33990fb06d1cafa516046c4f3a737ef849726 100644 --- a/slides/overview.md +++ b/slides/overview.md @@ -1,16 +1,17 @@ ## Overview 0. The Terminal -1. What is `git`? Why do I need it? <!--(5 min)//--> +1. What is `git`? <!--(5 min)//--> 2. GitHub and GitLab <!--(5min)//--> * Practical session <!--(5 min)//--> - GitLab interface - GitHub interface -3. The 5 essential commands <!--(10 min)//--> +3. Installation of `git` +4. The 5 essential commands <!--(10 min)//--> * Practical session <!--(15 min)//--> - `clone/pull` / `status` / `add` / `commit` / `push` -4. Branches <!--(10 min)//--> +5. Branches <!--(10 min)//--> * Practical session <!--(10 min)//--> -5. Forks <!--(10 min)//--> +6. Forks <!--(10 min)//--> * Practical session <!--(10 min)//--> -6. Evaluation <!--(10 min)//--> +7. Evaluation <!--(10 min)//--> diff --git a/slides/part-7-github-pages.md b/slides/part-7-github-pages.md deleted file mode 100644 index 76259f13d054d285a317478cd3d84561eb01e629..0000000000000000000000000000000000000000 --- a/slides/part-7-github-pages.md +++ /dev/null @@ -1,27 +0,0 @@ -## Dépôt magique - -`<user>.github.io` - -`master => http://<user>.github.io/` - - -## Branche magique - -Tous les autres dépôt GitHub: - -`gh-pages => http://<user>.github.io/<repository>/` - - -## Action! - -Un simple fichier `index.html` suffit :) - - -## Marque blanche - -`http://<user>.github.io => http://your.domain` - -Utilisez un fichier `CNAME` à la racine du dépôt. -[Détails](https://help.github.com/articles/setting-up-a-custom-domain-with-pages) - -Exemple: [ssaunier.github.io/CNAME](https://github.com/ssaunier/ssaunier.github.io/blob/master/CNAME) diff --git a/slides/part-8-thanks.md b/slides/thanks.md similarity index 81% rename from slides/part-8-thanks.md rename to slides/thanks.md index 9e575cbbe20ec175f5e0e3341f6c36be6c2d9b15..d360c3838438cce197c7864351bb9d4c54ef07b1 100644 --- a/slides/part-8-thanks.md +++ b/slides/thanks.md @@ -1,3 +1,10 @@ +# References + +[1]: **Git** Book: https://git-scm.com/book/en/v2 + + +# Acknowledgement + Laurent Heirendt  diff --git a/slides/the_terminal.md b/slides/the_terminal.md index c910b077a1d673bd89c7e52a4bf094c35ee2f66f..10b5da92590079c256e5ecc72c9a044368083a9b 100644 --- a/slides/the_terminal.md +++ b/slides/the_terminal.md @@ -33,26 +33,3 @@ Create a directory ```sh $ mkdir myNewDirectory ``` - - -## What is `git`? Why do I need it? - - - - - -Designed and implemented in 2005 by **Linus Torvalds** - -`git` is a version tracking system, essentially for code. -Collaborative platform for code development - - - -## The 5 essential commands - -`pull, status, add, commit, push` - -note: - Put your speaker notes here. - You can see them pressing 's'. - Fullscreen can be activated by typing 'f'. diff --git a/slides/what_is_git.md b/slides/what_is_git.md new file mode 100644 index 0000000000000000000000000000000000000000..4f0f6b5d1d74966f88f55cb2df0e9d2d28d2a789 --- /dev/null +++ b/slides/what_is_git.md @@ -0,0 +1,11 @@ +## What is `git`? + + + +Designed and implemented in 2005 by **Linus Torvalds** + + + +`git` is a **version control system** (VCS) for tracking changes in computer files and coordinating work on those files among multiple people [1]. + +<div align="left"><small>[1] *https://en.wikipedia.org/wiki/Git*</small></div>