Fix broken links

.gitignore

@@ -1,3 +1,4 @@
 *~
 repo/
 work/
+slides/git_elic.html

README.md

@@ -2,7 +2,7 @@
 
 ## Purpose
 
-The Git Training session started with a lesson of basics on Git and collaborative development. You can find the presentation [here](./slides/git_elic.html).
+The Git Training session started with a lesson of basics on Git and collaborative development. You can find the presentation [here](./slides/git_elic.pdf).
 
 The second part of the Git Training consists on a hands on. The objectives are to show how to use:
 
@@ -36,26 +36,10 @@ git config --global core.editor "vim"
 git config --global push.default simple
 ```
 
-Clone the Git_Training repository
-
-For instance:
-
-```bash
-[ ! -f ~/.ssh/id_rsa.pub ] && ssh-keygen -t rsa
-cat ~/.ssh/id_rsa.pub | xclip -sel clip
-```
-
-```bash
-1. Go to https://gogs.elic.ucl.ac.be/user/settings/ssh, 
-2. click on the 'Add Key' button, 
-3. enter the Key Name you want, 
-4. and finally do a 'CTRL-V' in Content. 
-```
-
-And now:
+Clone the Git_Training repository :
 
 ```bash
-git clone ssh://git@www.climate.be:3022/TECLIM/Git_Training.git
+git clone https://gogs.elic.ucl.ac.be/TECLIM/Git_Training.git
 ```
 
 ### Windows or Mac

project/README.md

@@ -1,8 +1,9 @@
 # Git tutorial - session
+
 We are going to do some exercises in this dummy project.
 
-- [linux](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux)
-- [windows](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows)
+- [linux](./linux/)
+- [windows](./windows/)
 
 ## Basics
 

project/linux/README.md

@@ -19,10 +19,10 @@ It is very simple, only consists in a couple of files written in bash and you wi
 
 In this tutorial you will learn how to make commits in the Git project, to create several branches, to push things to Gogs, and to follow a standard procedure to develop collaboratively. Afterwards, you should apply the same methods to any other collaborative development inside the ELIC department. The objectives will be achieved gradually following these topics:
 
-1.     [Set up your working environment](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/working_environment)
-2.     [Prepare issues on Gogs](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/gogs_issues)
-3.     [Prepare branches](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/branches)
-4.     [Add new functions](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/functions)
-5.     [Create pull request](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/pull_request)
-6.     [Review and test others' branches](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/review)
-7.     [Pull master changes](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/pull_master)
+1.     [Set up your working environment](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/working_environment)
+2.     [Prepare issues on Gogs](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/gogs_issues)
+3.     [Prepare branches](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/branches)
+4.     [Add new functions](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/functions)
+5.     [Create pull request](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/pull_request)
+6.     [Review and test others' branches](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/review)
+7.     [Pull master changes](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/pull_master)

project/linux/functions/README.md

@@ -24,7 +24,7 @@ git commit -m "message explaining what you have done. Fixes issue #issue_number"
 
 When we run `git commit`, Git takes everything we have told it to save by using `git add` and stores a copy permanently inside the special `.git` directory. This permanent copy is called a commit (or revision) and its short identifier is `f22b25e` (Your commit may have another identifier.)
 
-You can do as many commits as you wish while developing your function. If you reach a point at which any of the open issues gets solved, you can make your commit message end with `Fixes #issue_number` ([Exercise 4 – Open new issue in Git_Training project](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/gogs_issues)).
+You can do as many commits as you wish while developing your function. If you reach a point at which any of the open issues gets solved, you can make your commit message end with `Fixes #issue_number` ([Exercise 4 – Open new issue in Git_Training project](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/gogs_issues)).
 
 If you don't specify the `-m` parameter a text editor will open automatically to allow you to write the commit message.
 

project/linux/pull_master/README.md

@@ -4,7 +4,7 @@ Once the project coordinator has accepted all pull requests, there is a new vers
 
 ## Exercise 13 - Update master branch
 
-Following instruction from [Exercise 10 – Checkout a branch from Git_Training project](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/review), checkout the master branch.
+Following instruction from [Exercise 10 – Checkout a branch from Git_Training project](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/linux/review), checkout the master branch.
 
 ```
 git checkout master

project/windows/README.md

@@ -5,10 +5,10 @@ It is very simple, only consists in a HTML file and a CSS file and you will have
 
 In this tutorial you will learn how to make commits in the Git project, to create several branches, to push things to GitHub, and to follow a standard procedure to develop collaboratively. Afterwards, you should apply the same methods to any other collaborative development inside your department. The objectives will be achieved gradually following these topics:
 
-1.     [Set up your working environment](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/working_environment)
-2.     [Prepare issues](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/issues)
-3.     [Prepare branches](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/branches)
-4.     [Add new content](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/functions)
-5.     [Create pull request](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/pull_request)
-6.     [Review and test others' branches](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/review)
-7.     [Pull master changes](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/pull_master)
+1.     [Set up your working environment](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/working_environment)
+2.     [Prepare issues](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/issues)
+3.     [Prepare branches](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/branches)
+4.     [Add new content](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/functions)
+5.     [Create pull request](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/pull_request)
+6.     [Review and test others' branches](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/review)
+7.     [Pull master changes](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/pull_master)

project/windows/branches/README.md

@@ -10,7 +10,7 @@ Create the new branch checking off from “master” branch (Here the branch nam
 
 |||
 | -------- | -------- |
-| ![Git-Bash-14.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/14.png) | ![Git-Bash-15.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/15.png) |
+| ![Git-Bash-14.png](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/14.png) | ![Git-Bash-15.png](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/15.png) |
 
 `<branch_name>` could be the name of the PC you are working on.
 
@@ -18,5 +18,5 @@ Switch to that branch
 
 |||
 | -------- | -------- |
-| ![Git-Bash-16.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/16.png) | ![Git-Bash-17.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/17.png) |
-| ![Git-Bash-18.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/18.png) | |
+| ![Git-Bash-16.png](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/16.png) | ![Git-Bash-17.png](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/17.png) |
+| ![Git-Bash-18.png](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/18.png) | |

project/windows/functions/README.md

@@ -24,7 +24,7 @@ git commit -m "message explaining what you have done. Fixes issue #issue_number"
 
 When we run `git commit`, Git takes everything we have told it to save by using `git add` and stores a copy permanently inside the special `.git` directory. This permanent copy is called a commit (or revision) and its short identifier is `f22b25e` (Your commit may have another identifier.)
 
-You can do as many commits as you wish while developing your function. If you reach a point at which any of the open issues gets solved, you can make your commit message end with `Fixes #issue_number` ([Exercise 4 – Open new issue in Git_Training project](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/issues)).
+You can do as many commits as you wish while developing your function. If you reach a point at which any of the open issues gets solved, you can make your commit message end with `Fixes #issue_number` ([Exercise 4 – Open new issue in Git_Training project](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/issues)).
 
 If you don't specify the `-m` parameter a text editor will open automatically to allow you to write the commit message.
 

project/windows/pull_master/README.md

@@ -4,7 +4,7 @@ Once the project coordinator has accepted all pull requests, there is a new vers
 
 ## Exercise 13 - Update master branch
 
-Following instruction from [Exercise 10 – Checkout a branch from Git_Training project](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/review), checkout the master branch.
+Following instruction from [Exercise 10 – Checkout a branch from Git_Training project](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project/windows/review), checkout the master branch.
 
 ```
 git checkout master

project/windows/working_environment/README.md

@@ -4,7 +4,7 @@
 
 First of all you will have to configure git locally in your desktop:
 
-You must have git installed. See the instructions [here](https://www.elic.ucl.ac.be/TECLIM/Git_Training/src/master/resources/README.md)
+You must have git installed. See the instructions [here](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/resources/README.md)
 
 Go to [https://github.com/](https://github.com/) and "Sign-in".
 
@@ -16,15 +16,15 @@ To start working you need to create a clone, called afterward “working copy”
 
 For instance, paste the URL into TortoiseGit and it will clone the repo locally on your computer:
 
-![6.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/6.png)
+![6.png](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/6.png)
 
 It will ask for your username and password and you will see output like this:
 
-![7.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/7.png)
+![7.png](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/7.png)
 
 It has created a 'Git_Training' folder and you can browse into it:
 
-![8.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/8.png)
+![8.png](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/8.png)
 
 Git clone allows you to specify parameters such as the target folder. If you don't specify it the working copy will be named as the project.
 
@@ -74,29 +74,29 @@ Date:   Thu Dec 3 19:04:16 2015 +0100
 
 #### Make some changes new-file.txt
 
-![9.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/9.png)
+![9.png](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/9.png)
 
 #### Commit your local changes to your local repository
 
 Click with the right mouse button and click on “Git Commit”
 
-![10.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/10.png)
+![10.png](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/10.png)
 
 You should see the following window:
 
-![11.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/11.png)
+![11.png](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/11.png)
 
 In the message section, write a short summary of your commit. It is good practice to always have meaningful messages. Do not forget to add your files in the bottom part of the window. 
 
 When you are done with these steps, you can click on `[Commit]` and you should see the following window:
 
-![12.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/12.png)
+![12.png](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/12.png)
 
 In this window, you can see how many files were changed and how many insertions and/or deletions were made. If you are satisfied with the information just click on `[Push]`.
 
 #### Push your changes to the remote repository in GitHub
 
-![13.png](https://www.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/13.png)
+![13.png](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/13.png)
 
 In this window, you can manage to which branch you are pushing your files, but we will talk about branches later in the exercise. For now, just click on `[OK]` and your file will be pushed to the master branch.
 

slides/git_elic.md

@@ -289,7 +289,8 @@ graph LR;
 - create a new branch : `git checkout -b newbranch`
 - switch to a branch : `git checkout newbranch`
 - delete a branch : `git branch -d newbranch`
-- list all branches : `git branch`
+- list all branches : `git branch -a`
+  > see both local and remote branches 
 
 ### branch is cheap : do it often :+1:
 > branch allow to have short/long term parallel development