Browse Source

Update windows project

Pierre-Yves Barriat 2 years ago
parent
commit
1c4e78a4b9

+ 5 - 4
README.md

@@ -2,11 +2,12 @@
 
 
 ## Purpose
 ## 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.pdf).
+The Git Training session started with a lesson of basics on Git and collaborative development. You can find the slides [here](./slides/git_elic.pdf).
+> Presentation is [here](https://www.elic.ucl.ac.be/users/pbarriat/git/git_elic.html)
 
 
 The second part of the Git Training consists on a hands on. The objectives are to show how to use:
 The second part of the Git Training consists on a hands on. The objectives are to show how to use:
 
 
-- Git on the command line OR TortoiseGit with Windows
+- git on the command line **OR** [gitforwindows](https://gitforwindows.org/) with Windows
 - Gogs portal
 - Gogs portal
 
 
 We are going to do some exercises in a dummy project that you can find in this common Gogs [repository](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project).
 We are going to do some exercises in a dummy project that you can find in this common Gogs [repository](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/src/master/project).
@@ -52,9 +53,9 @@ Clone the Git_Training repository:
 https://gogs.elic.ucl.ac.be/TECLIM/Git_Training.git
 https://gogs.elic.ucl.ac.be/TECLIM/Git_Training.git
 ```
 ```
 
 
-For instance, paste the URL into TortoiseGit and it will clone the repo locally on your computer:
+For instance, paste the URL into **gitforwindows** and it will clone the repo locally on your computer:
 
 
-![6.png](resources/img/6.png)
+![git_gui.png](resources/img/git_gui.png)
 
 
 ## Tips and Tricks
 ## Tips and Tricks
 
 

+ 14 - 7
project/windows/working_environment/README.md

@@ -1,30 +1,37 @@
 # Set up your working environment
 # Set up your working environment
 
 
-## Exercise 1 – Git global configuration and Github configuration
+## Exercise 1 - Git global configuration
 
 
 First of all you will have to configure git locally in your desktop:
 First of all you will have to configure git locally in your desktop:
 
 
-You must have git installed. See the instructions [here](https://gogs.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".
+### Gogs
+
+Go to https://gogs.elic.ucl.ac.be/ and "Sign-in".
+> Choose **local** and use your family name as login and your name as password.
+
+### GitHub
+
+Go to https://github.com/ and "Sign-in".
 
 
 After completing this step you will need to ask access to the repositories you want. Send an email to the administrators of this (these) project(s) asking access to.
 After completing this step you will need to ask access to the repositories you want. Send an email to the administrators of this (these) project(s) asking access to.
 
 
-## Exercise 2 – Clone into a working environment
+## Exercise 2 - Clone a project
 
 
 To start working you need to create a clone, called afterward “working copy” of the git_tutorial project from Github in your home (or folder of your choice):
 To start working you need to create a clone, called afterward “working copy” of the git_tutorial project from Github in your home (or folder of your choice):
 
 
 For instance, paste the URL into TortoiseGit and it will clone the repo locally on your computer:
 For instance, paste the URL into TortoiseGit and it will clone the repo locally on your computer:
 
 
-![6.png](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/6.png)
+![git_gui.png](../../../resources/img/git_gui.png)
 
 
 It will ask for your username and password and you will see output like this:
 It will ask for your username and password and you will see output like this:
 
 
-![7.png](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/7.png)
+![7.png](../../../resources/img/7.png)
 
 
 It has created a 'Git_Training' folder and you can browse into it:
 It has created a 'Git_Training' folder and you can browse into it:
 
 
-![8.png](https://gogs.elic.ucl.ac.be/TECLIM/Git_Training/raw/master/resources/8.png)
+![8.png](../../../resources/img/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.
 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.
 
 

+ 1 - 1
resources/README.md

@@ -24,7 +24,7 @@ During install select the following (for any other options given choose the defa
 |![Git-Bash-G.png](https://zwartell.gitlab.io/Git_Tutorial_and_Coding_Standards/images/Git-Bash-G.png) |![Git-Bash-H.png](https://zwartell.gitlab.io/Git_Tutorial_and_Coding_Standards/images/Git-Bash-H.png) |
 |![Git-Bash-G.png](https://zwartell.gitlab.io/Git_Tutorial_and_Coding_Standards/images/Git-Bash-G.png) |![Git-Bash-H.png](https://zwartell.gitlab.io/Git_Tutorial_and_Coding_Standards/images/Git-Bash-H.png) |
 |![Git-Bash-I.png](https://zwartell.gitlab.io/Git_Tutorial_and_Coding_Standards/images/Git-Bash-I.png) |![Git-Bash-J.png](https://zwartell.gitlab.io/Git_Tutorial_and_Coding_Standards/images/Git-Bash-J.png) |
 |![Git-Bash-I.png](https://zwartell.gitlab.io/Git_Tutorial_and_Coding_Standards/images/Git-Bash-I.png) |![Git-Bash-J.png](https://zwartell.gitlab.io/Git_Tutorial_and_Coding_Standards/images/Git-Bash-J.png) |
 
 
-> Don't forget to launch "Git Bash" to generate your ssh keys: `ssh-keygen -t rsa`
+> You should use [Visual Studio Code](https://code.visualstudio.com/download) as default editor. 
 
 
 Setup of Git GUI’s: download and install TortoiseGit from [tortoisegit.org](https://tortoisegit.org/)
 Setup of Git GUI’s: download and install TortoiseGit from [tortoisegit.org](https://tortoisegit.org/)
 
 

BIN
resources/img/git_gui.png


BIN
slides/git_elic.pdf