Browse Source

Reorder local/remote in slides

Pierre-Yves Barriat 2 years ago
parent
commit
58cefb644e
3 changed files with 36 additions and 36 deletions
  1. 2 2
      slides/compile.sh
  2. 34 34
      slides/git_elic.md
  3. BIN
      slides/git_elic.pdf

+ 2 - 2
slides/compile.sh

@@ -7,7 +7,6 @@
 #
 # Install npm (needed for mermaid: nice extension to make diagramm)
 # npm i
-# sudo apt install npm
 #
 
 # without mermaid
@@ -18,4 +17,5 @@
 # with mermaid
 
 npx marp --allow-local-files --theme ./assets/tum.css -c ./assets/marp.config.js ./git_elic.md -o git_elic.pdf
-npx marp --template bespoke --bespoke.progress --allow-local-files --theme ./assets/tum.css -c ./assets/marp.config.js ./git_elic.md -o ./git_elic.html
+npx marp --template bespoke --bespoke.progress --allow-local-files --theme ./assets/tum.css -c ./assets/marp.config.js ./git_elic.md -o ./git_elic.html
+

+ 34 - 34
slides/git_elic.md

@@ -171,21 +171,6 @@ each snapshot is called **commit** which is :
 
 ---
 
-Your changes are now in the **HEAD** of your local working copy. 
-
-**push**
->to send those changes to your remote repository
-```bash
-git push
-```
-**pull**
->to update your local working directory to the newest commit, to fetch and merge remote changes
-```bash
-git pull
-```
-
----
-
 # `git` diff
 
 ```mermaid
@@ -232,25 +217,6 @@ But, **to be familiar with Git**, try the command line
 
 ---
 
-# Simple Git Exercices
-
-First, configure your environment (just once) :construction:
-> on your laptop, on your ELIC account, etc
-
-```bash
-git config --global user.name "Your Name"
-git config --global user.email "foo@bar.be"
-git config --global color.ui auto
-git config --global core.editor "vim"
-
-git config --list
-```
-Now, clone https://gogs.elic.ucl.ac.be/TECLIM/Git_Training.git
-> Theses are very simple exercices to learn to manipulate git.
-> In each folder, simply run `./create.sh` and follow the guide :sunglasses:
-
----
-
 # `git` branches
 
 - a **branch** is pointer to a commit (represent an history)
@@ -378,6 +344,21 @@ Analogie à SVN
 
 ---
 
+Your changes are now in the **HEAD** of your local working copy. 
+
+**push**
+>to send those changes to your remote repository
+```bash
+git push
+```
+**pull**
+>to update your local working directory to the newest commit, to fetch and merge remote changes
+```bash
+git pull
+```
+
+---
+
 ![bg 95%](assets/04.png)
 
 <!-- _footer: "**Limitation**" -->
@@ -456,4 +437,23 @@ pull = fetch + merge
 
 ---
 
+# Simple Git Exercices
+
+First, configure your environment (just once) :construction:
+> on your laptop, on your ELIC account, etc
+
+```bash
+git config --global user.name "Your Name"
+git config --global user.email "foo@bar.be"
+git config --global color.ui auto
+git config --global core.editor "vim"
+
+git config --list
+```
+Now, clone https://gogs.elic.ucl.ac.be/TECLIM/Git_Training.git
+> Theses are very simple exercices to learn to manipulate git.
+> In each folder, simply run `./create.sh` and follow the guide :sunglasses:
+
+---
+
 # Version control with Git for scientists :chart_with_upwards_trend:

BIN
slides/git_elic.pdf