From 871be155d44e1316e843b1b4bebddd90db614a7f Mon Sep 17 00:00:00 2001 From: laurentheirendt <laurent.heirendt@uni.lu> Date: Mon, 30 May 2022 13:56:42 +0200 Subject: [PATCH] minor changes to text --- .../slides/versioning.md | 4 +++- .../slides/what_is_git.md | 20 ++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/versioning.md b/2022/2022-05-31_git-trilogy-part-1/slides/versioning.md index 0a60c35c..e9fa7c83 100644 --- a/2022/2022-05-31_git-trilogy-part-1/slides/versioning.md +++ b/2022/2022-05-31_git-trilogy-part-1/slides/versioning.md @@ -75,7 +75,9 @@ note: overhead for doing this manually is huge # Using versioning system? -What happens if **3** people contribute? + +What happens when **3** people contribute? + ``` my-document_v01_AK.docx my-document_v01_AK_BP.docx diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/what_is_git.md b/2022/2022-05-31_git-trilogy-part-1/slides/what_is_git.md index e6c92a3f..a2804461 100644 --- a/2022/2022-05-31_git-trilogy-part-1/slides/what_is_git.md +++ b/2022/2022-05-31_git-trilogy-part-1/slides/what_is_git.md @@ -4,17 +4,14 @@ Designed and implemented in 2005 by **Linus Torvalds** -<div style="position:relative; left:60%;"> +<div align="center"> <img src="slides/img/linus.jpg"> </div> -<div style="position:absolute; left:50%;"> [1] *https://en.wikipedia.org/wiki/Git* -</div> -<br> -<div class="fragment"> + ## The inventor of `git` @@ -24,19 +21,18 @@ 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.` -Linus Torvald (2007-06-14) +Linus Torvalds (2007-06-14) # What is the use of `git`? -* Ability to recover old versions -<div style="position:absolute;left:45%;top:75%"> -<img src="slides/img/Git-logo.png"> +<div align="center"> +<img src="slides/img/Git-logo.png" height="120"> </div> -<div class="fragment"> - +* Ability to recover old versions +* No need to fully rewrite text or code; **reuse** and **save time** * Keep the changes you made over time (**history**) to every single line * Annotate each change with description * **Backtrack** (if necessary) and undo unwanted changes @@ -48,6 +44,6 @@ note: Other points to mention: -* comes from SW development domain with >100 of people contributing to one project +* git stems from SW development domain with >100 of people contributing to one project * 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. -- GitLab