diff --git a/index.md b/index.md index 00b2f0273013a87530a3e18b9fc28cfbd5ad454e..a4983e18f9167dfd47265f60e2d5d50f0234b569 100644 --- a/index.md +++ b/index.md @@ -32,7 +32,7 @@ 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 +Demo that if pushed to a branch, we will have a conflict -> submit a PR to DEVELOP from own branch to avoid that 2. Github diff --git a/installation.md b/installation.md new file mode 100644 index 0000000000000000000000000000000000000000..e82e3bafd0127504a10b894a3628ef9f90f55aa6 --- /dev/null +++ b/installation.md @@ -0,0 +1,21 @@ +## Installation + +<img src="img/github_app.png" class="as-is" height="300" /> + +[mac.github.com](http://mac.github.com) ou [windows.github.com](http://windows.github.com) + +## Configuration + +```shell +$ git config --global user.name "Firstname Lastname" +$ git config --global user.email "first.last@uni.lu" +$ git config -l +``` + + +## Does it work? + +```shell +$ git --version +# git version 1.8.5 +``` diff --git a/list.json b/list.json index a1eef01ab3ba641d42b0e0ff0a35725e42aa5a4c..b6f53836baaf02f3912598f0623edc104bce7b9f 100644 --- a/list.json +++ b/list.json @@ -6,12 +6,17 @@ } }, { - "filename": "part-2-git-intro.md", + "filename": "overview.md", "attr": { } }, { - "filename": "part-3-installation.md", + "filename": "the_terminal.md", + "attr": { + } + }, + { + "filename": "installation.md", "attr": { } }, diff --git a/overview.md b/overview.md new file mode 100644 index 0000000000000000000000000000000000000000..c4959e78ff5750569b0f4f532d6f2192c9488546 --- /dev/null +++ b/overview.md @@ -0,0 +1,18 @@ +## Overview + +0. The Terminal +1. What is `git`? Why do I need it? (5 min) +2. GitHub and GitLab (5min) + * Practical session (5 min) + - GitLab interface + - GitHub interface +3. The 5 essential commands (10 min) + * Practical session (15 min) + - init + - clone + - add +4. Branches (10 min) + * Practical session (10 min) +5. Forks (10 min) + * Practical session (10 min) +6. Evaluation (10 min) diff --git a/the_terminal.md b/the_terminal.md new file mode 100644 index 0000000000000000000000000000000000000000..c910b077a1d673bd89c7e52a4bf094c35ee2f66f --- /dev/null +++ b/the_terminal.md @@ -0,0 +1,58 @@ +## The Linux Terminal + +Starting the terminal presents itself with a line where you can enter a command: +```sh +michael@myComputer> +``` +Often written, for covenience, as: +```sh +$ +``` +When you open your terminal (git shell) and unless otherwise configured, you are located +in your home directory, denoted as `~/`. + + +## Essential Linux commands + +List the contents of a directory +```sh +$ ls +``` + +Change the directory to a specific folder +```sh +$ cd myDirectory +``` + +Change the directory 1 level and 2 levels up +```sh +$ cd .. +$ cd ../.. +``` +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'.