From ec92f8c01528ac82e9ddf359fcce9ad85c046285 Mon Sep 17 00:00:00 2001
From: laurentheirendt <laurent.heirendt@uni.lu>
Date: Mon, 7 Oct 2019 08:29:45 +0200
Subject: [PATCH] add ignore to index and fix url
---
.../slides/gettingStarted.md | 2 +-
.../slides/overview.md | 16 +++++++++-------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/2019/2019-10-10_advancedGitTraining-SIU/slides/gettingStarted.md b/2019/2019-10-10_advancedGitTraining-SIU/slides/gettingStarted.md
index 07181df4..39353bb4 100644
--- a/2019/2019-10-10_advancedGitTraining-SIU/slides/gettingStarted.md
+++ b/2019/2019-10-10_advancedGitTraining-SIU/slides/gettingStarted.md
@@ -11,7 +11,7 @@
```bash
$ cd advanced-git-practice
# add upstream URL
- $ git remote add upstream git@github.com:<first.last>/advanced-git-practice.git
+ $ git remote add upstream git@github.com:LCSB-BioCore/advanced-git-practice.git
$ git fetch upstream
```
* Check the remotes with:
diff --git a/2019/2019-10-10_advancedGitTraining-SIU/slides/overview.md b/2019/2019-10-10_advancedGitTraining-SIU/slides/overview.md
index 3b769f40..f6631a0a 100644
--- a/2019/2019-10-10_advancedGitTraining-SIU/slides/overview.md
+++ b/2019/2019-10-10_advancedGitTraining-SIU/slides/overview.md
@@ -2,16 +2,18 @@
1. Installation and getting started
-2. Amend last commit
+2. Ignoring files
-3. Resetting to a previous commit
+3. Amend last commit
-4. Reverting commits
+4. Resetting to a previous commit
-5. Rebasing in Git
+5. Reverting commits
-6. Git cherry-picking
+6. Rebasing in Git
-7. Merging branches
+7. Git cherry-picking
-8. Conflict Resolution
+8. Merging branches
+
+9. Conflict Resolution
--
GitLab