From 691da1f4e15539b612b2411e968c2535f7025f1a Mon Sep 17 00:00:00 2001 From: laurentheirendt <laurent.heirendt@uni.lu> Date: Mon, 30 Mar 2020 11:28:52 +0200 Subject: [PATCH] minor changes --- 2020/2020-03-30_basicGitTraining/slides/configuration.md | 6 ++++++ .../slides/essential_commands.md | 6 +++--- 2020/2020-03-30_basicGitTraining/slides/thanks.md | 6 ++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/2020/2020-03-30_basicGitTraining/slides/configuration.md b/2020/2020-03-30_basicGitTraining/slides/configuration.md index 0b07cc41..6217c28d 100644 --- a/2020/2020-03-30_basicGitTraining/slides/configuration.md +++ b/2020/2020-03-30_basicGitTraining/slides/configuration.md @@ -41,6 +41,12 @@ If you don’t have yet an SSH key, you have to generate one: $ ssh-keygen -t rsa # -b 4096 ``` +If you set a password to your key (recommended), add it to the `ssh-agent`: +```bash +$ eval "$(ssh-agent -s)" +$ ssh-add -K ~/.ssh/id_rsa +``` + Then, add the SSH key to Github/Gitlab. <img src="slides/img/icon-live-demo.png" height="100px"> \ No newline at end of file diff --git a/2020/2020-03-30_basicGitTraining/slides/essential_commands.md b/2020/2020-03-30_basicGitTraining/slides/essential_commands.md index 0fa56f47..2753772c 100644 --- a/2020/2020-03-30_basicGitTraining/slides/essential_commands.md +++ b/2020/2020-03-30_basicGitTraining/slides/essential_commands.md @@ -35,11 +35,11 @@ $ git status # Modify a file -Copy the file `template.md` in the folder `_attendees` and rename it with your firstname: +Copy the file `template.md` in the folder `attendees` and rename it with your firstname: ```bash -$ cd _attendees -$ cp template.md myName.md +$ cd attendees +$ cp firstnameLastname.md myName.md ``` Then, make your changes with your favorite editor! diff --git a/2020/2020-03-30_basicGitTraining/slides/thanks.md b/2020/2020-03-30_basicGitTraining/slides/thanks.md index 249286cd..27802556 100644 --- a/2020/2020-03-30_basicGitTraining/slides/thanks.md +++ b/2020/2020-03-30_basicGitTraining/slides/thanks.md @@ -24,11 +24,9 @@ # References & Cheat sheet -[1]: Git Book: https://git-scm.com/book/en/v2 +1. Git Book: https://git-scm.com/book/en/v2 -[2]: GitHub training services: https://services.github.com/training/ - -[3]: Cheat sheet: http://rogerdudler.github.io/git-guide +2. Cheat sheet: http://rogerdudler.github.io/git-guide -- GitLab