From ad4b894b9a66c8ab9c80722b03c97c0523c831de Mon Sep 17 00:00:00 2001 From: laurentheirendt <laurent.heirendt@uni.lu> Date: Wed, 2 Oct 2019 18:43:18 +0200 Subject: [PATCH] minor formatting changes --- .../slides/forks.md | 5 ++++- .../slides/syncFork.md | 2 +- .../slides/what_is_git.md | 17 +++++++++++------ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/2019/2019-10-03_basicGitTraining-SIU/slides/forks.md b/2019/2019-10-03_basicGitTraining-SIU/slides/forks.md index 6690f36a..f7572078 100644 --- a/2019/2019-10-03_basicGitTraining-SIU/slides/forks.md +++ b/2019/2019-10-03_basicGitTraining-SIU/slides/forks.md @@ -1,5 +1,6 @@ # What is a `fork`? +<br><br> <center><img src="slides/img/fork.jpg" class="as-is" height="500em"/></center> <!--http://www.cndajin.com/data/wls/246/22302193.jpg--> @@ -7,6 +8,7 @@ # Not really ... +<br><br> <center><img src="slides/img/fork-crossed.png" class="as-is" height="500em"/></center> @@ -23,6 +25,7 @@ - In other words, you have to work on your own <font color="red">**fork**</font>. +<br> <h2>How to get a fork?</h1> Browse to the original repository and click on the button `Fork`: @@ -52,7 +55,7 @@ $ cd basic-git-practice If you did not configure your SSH key, clone using HTTPS: ```bash -$ git clone https://github.com/userName/basic-git-practice.git basic-git-practice +$ git clone https://github.com/<yourName>/basic-git-practice.git ``` diff --git a/2019/2019-10-03_basicGitTraining-SIU/slides/syncFork.md b/2019/2019-10-03_basicGitTraining-SIU/slides/syncFork.md index ce26041e..95e12dbc 100644 --- a/2019/2019-10-03_basicGitTraining-SIU/slides/syncFork.md +++ b/2019/2019-10-03_basicGitTraining-SIU/slides/syncFork.md @@ -18,7 +18,7 @@ $ git remote -v <div class="fragment"> -Fetch the changes from upstream (similar to pull) +Fetch (download) the changes from upstream (fetch = pull & merge) ```bash $ git fetch upstream ``` diff --git a/2019/2019-10-03_basicGitTraining-SIU/slides/what_is_git.md b/2019/2019-10-03_basicGitTraining-SIU/slides/what_is_git.md index 973cc059..64f573d0 100644 --- a/2019/2019-10-03_basicGitTraining-SIU/slides/what_is_git.md +++ b/2019/2019-10-03_basicGitTraining-SIU/slides/what_is_git.md @@ -1,4 +1,4 @@ -# What is `git`? +# What is `git`? (i) <!--  --> @@ -14,7 +14,7 @@ Designed and implemented in 2005 by **Linus Torvalds** -# The inventor of `git` +# What is `git`? (ii) <div align="center"> <img src="slides/img/git_definition.png"> @@ -22,6 +22,7 @@ Designed and implemented in 2005 by **Linus Torvalds** `I'm an egotistical bastard, and I name all my projects after myself. First Linux, now git.` +<br> Linus Torvald (2007-06-14) @@ -29,12 +30,16 @@ Linus Torvald (2007-06-14) # What is the use of `git`? * No need to fully rewrite code; **reuse code** and **save time** + * Keep the changes you made over time (**history**) + * Allows you to **backtrack** (if necessary) and undo unwanted changes + * Easily **add contributions** of your collaborators to the main code base -note: +<br> +Other points: + +- git shall not be considered as a nuisance, but as a tool that should help to track and trace the code. -Other points to mention: -* git shall not be considered as a nuisance, but as a tool that should help to track and trace the code. -* git is not to track performance. Not using it shows exactly the opposite. +- git is not to track performance. Not using it shows exactly the opposite. -- GitLab