From e41ccfb2ff079ca8f69a6fe9f19dc82acf0192c8 Mon Sep 17 00:00:00 2001 From: Sylvain Arreckx <sylvain.arreckx@gmail.com> Date: Tue, 17 Jan 2017 16:40:08 +0100 Subject: [PATCH] New why use git section and polish other slides. --- branches.md | 4 ++-- essential_commands.md | 2 +- list.json | 12 ++++++++++++ ready.md | 1 + thanks.md | 17 ----------------- what_is_git.md | 4 ++-- why_use_git.md | 6 ++++++ 7 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 ready.md create mode 100644 why_use_git.md diff --git a/branches.md b/branches.md index d4cd1f0f..4e77d236 100644 --- a/branches.md +++ b/branches.md @@ -2,7 +2,7 @@ Branch-off within the same repository in order to stay safe! -The master branch: +<br><br>The master branch <img src="img/branch-master.png" class="branch-master" /> @@ -23,7 +23,7 @@ $ git push ``` -If you do that, `git` will complain +If you do that, `git` might complain ```bash fatal: The current branch matrix_vect_mult_myName has no upstream branch. To push the current branch and set the remote as upstream, use diff --git a/essential_commands.md b/essential_commands.md index 25aa3f01..606266ff 100644 --- a/essential_commands.md +++ b/essential_commands.md @@ -52,7 +52,7 @@ Then, uncomment the line <br> Save and rename the file by adding your name ```bash -mv firstCommit/addTwoNumbers.m firstCommit/addTwoNumbers_myName.m +$ mv firstCommit/addTwoNumbers.m firstCommit/addTwoNumbers_myName.m ``` diff --git a/list.json b/list.json index 3dd91a69..eaa96734 100644 --- a/list.json +++ b/list.json @@ -23,6 +23,12 @@ "data-background": "../img/whiteBG.jpg" } }, + { + "filename": "why_use_git.md", + "attr": { + "data-background": "../img/whiteBG.jpg" + } + }, { "filename": "installation.md", "attr": { @@ -64,5 +70,11 @@ "attr": { "data-background": "../img/whiteBG.jpg" } + }, + { + "filename": "ready.md", + "attr": { + "data-background": "../img/whiteBG.jpg" + } } ] diff --git a/ready.md b/ready.md new file mode 100644 index 00000000..d4f8b411 --- /dev/null +++ b/ready.md @@ -0,0 +1 @@ +# Ready for a practice!!! diff --git a/thanks.md b/thanks.md index 62ab5a8b..bb4d48c1 100644 --- a/thanks.md +++ b/thanks.md @@ -6,20 +6,3 @@ ### Cheat sheet [Web](http://rogerdudler.github.io/git-guide/index.html) or [PDF](http://rogerdudler.github.io/git-guide/files/git_cheat_sheet.pdf) - -## Acknowledgement - -<table style="text-align:center; width:500px; - position:fixed; - margin-left:-250px; /* half of width */ - left:50%;"> - <tr> - <th></th> - <th></th> - </tr> - <tr> - <th>Laurent Heirendt</th> - <th>Sylvain Arreckx</th> - </tr> - -</table> diff --git a/what_is_git.md b/what_is_git.md index 44347eed..378da33e 100644 --- a/what_is_git.md +++ b/what_is_git.md @@ -1,10 +1,10 @@ ## What is `git`? - +<!--  --> `git` is a **version control system** (VCS) for tracking changes in computer files and coordinating work on those files among multiple people [1]. -Designed and implemented in 2005 by **Linus Torvalds** +<br><br><br>Designed and implemented in 2005 by **Linus Torvalds**  diff --git a/why_use_git.md b/why_use_git.md new file mode 100644 index 00000000..848e8dea --- /dev/null +++ b/why_use_git.md @@ -0,0 +1,6 @@ +# Why use git? + +* keep the changes you made over time +* allow you to backtrack (if necessary) and undo those changes +* easily add contributions of your collaborators to the main code base + -- GitLab