Merge branch 'minor-changes' into 'develop'

Minor changes to git training slides

See merge request R3/outreach/presentations!9

2019/2019-06-11_gitTraining/slides/branches.md

@@ -53,7 +53,7 @@ Exit by typing `q`. The branch with the * is the current branch.
 
 Checkout another branch
 ```bash
-$ git checkout branchName
+$ git checkout <branchName>
 ```
 
 <div class="fragment">
@@ -62,6 +62,7 @@ You can switch to the `develop` branch with
 ```bash
 $ git checkout develop
 ```
+If the local branch does not exist but the remote does, it is created automatically.
 
 <div class="fragment">
 

2019/2019-06-11_gitTraining/slides/essential_commands.md

@@ -54,13 +54,6 @@ $ git status
 # uncommitted changes (displayed in red)
 ```
 
-<div class="fragment">
-
-**ADVANCED**: see your changes in the terminal
-```bash
-$ git diff
-```
-exit with `q`
 
 <div class="fragment">
 
@@ -71,6 +64,14 @@ $ git status
 # returns the same as before, generally in green (means staged)
 ```
 
+<div class="fragment">
+
+**ADVANCED**: If there have been more changes after the file has been added, you can see your changes in the terminal
+```bash
+$ git diff
+```
+exit with `q`
+
 
 
 ## Add a commit message

2019/2019-06-11_gitTraining/slides/the_editor.md

@@ -5,4 +5,6 @@ Recommended editors:
 - **Visual Studio Code** (https://code.visualstudio.com)
 - **Atom** (https://atom.io)
 
+*Note*: Other editors such as IntelliJ IDEA (https://www.jetbrains.com/idea) or Sublime Text (https://www.sublimetext.com) can, of course, also be used.
+
 <img src="slides/img/icon-live-demo.png" height="100px">
\ No newline at end of file

2019/2019-06-11_gitTraining/slides/the_terminal.md

@@ -6,7 +6,7 @@
 
 ## The terminal (shell)
 
-**UNIX users (macOS & Linux):**
+**macOS users:**
 
 Start the Terminal from your `/Applications` directoy.