From 46b9fc9da1a1b22ff1107d8c385469f8cf4e58c9 Mon Sep 17 00:00:00 2001
From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu>
Date: Tue, 27 Aug 2019 10:52:24 +0200
Subject: [PATCH] Rename and adjust presentation slides
---
2019/2019-09-09_testCourseAdv/slides/list.json | 11 +++--------
.../slides/rebase-iPresentation1.md | 16 ++++++++++++++++
.../slides/rebase-iPresentation2.md | 18 +++++++-----------
...esentation6.md => rebase-iPresentation3.md} | 0
.../slides/rebase-iPresentation4.md | 12 ------------
5 files changed, 26 insertions(+), 31 deletions(-)
create mode 100644 2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation1.md
rename 2019/2019-09-09_testCourseAdv/slides/{rebase-iPresentation6.md => rebase-iPresentation3.md} (100%)
delete mode 100644 2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation4.md
diff --git a/2019/2019-09-09_testCourseAdv/slides/list.json b/2019/2019-09-09_testCourseAdv/slides/list.json
index 55cf515d..ea428783 100644
--- a/2019/2019-09-09_testCourseAdv/slides/list.json
+++ b/2019/2019-09-09_testCourseAdv/slides/list.json
@@ -30,22 +30,17 @@
}
},
{
- "filename": "rebase-iPresentation2.md",
- "attr": {
- }
- },
- {
- "filename": "rebase-iPresentation4.md",
+ "filename": "rebase-iPresentation1.md",
"attr": {
}
},
{
- "filename": "rebase-iPresentation5.md",
+ "filename": "rebase-iPresentation2.md",
"attr": {
}
},
{
- "filename": "rebase-iPresentation6.md",
+ "filename": "rebase-iPresentation3.md",
"attr": {
}
},
diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation1.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation1.md
new file mode 100644
index 00000000..e5c9f722
--- /dev/null
+++ b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation1.md
@@ -0,0 +1,16 @@
+## Interactive Rebase Workshop
+
+* Create and switch to your own branch
+* Add and commit two files to this branch:
+
+```bash
+$ echo "Name of one attendee" > attendeeName.md
+git add attendeeName.md
+git commit -m "Add name to the list of attendees"
+git push origin yourBranch
+
+$ echo "Name of a second attendee" > attendeeName2.md
+git add attendeeName2.md
+git commit -m "Add name to the list of attendees"
+git push origin yourBranch
+```
\ No newline at end of file
diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation2.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation2.md
index e5c9f722..d836b3e0 100644
--- a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation2.md
+++ b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation2.md
@@ -1,16 +1,12 @@
## Interactive Rebase Workshop
-* Create and switch to your own branch
-* Add and commit two files to this branch:
+* Perform an interactive rebase onto the develop branch
```bash
-$ echo "Name of one attendee" > attendeeName.md
-git add attendeeName.md
-git commit -m "Add name to the list of attendees"
-git push origin yourBranch
+git rebase -i develop
+```
-$ echo "Name of a second attendee" > attendeeName2.md
-git add attendeeName2.md
-git commit -m "Add name to the list of attendees"
-git push origin yourBranch
-```
\ No newline at end of file
+* reword the first commit's message to:
+`These are the two squashed commits`
+* combine the second and first commit into one,
+omitting the second's commit message.
\ No newline at end of file
diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation6.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation3.md
similarity index 100%
rename from 2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation6.md
rename to 2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation3.md
diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation4.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation4.md
deleted file mode 100644
index d836b3e0..00000000
--- a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation4.md
+++ /dev/null
@@ -1,12 +0,0 @@
-## Interactive Rebase Workshop
-
-* Perform an interactive rebase onto the develop branch
-
-```bash
-git rebase -i develop
-```
-
-* reword the first commit's message to:
-`These are the two squashed commits`
-* combine the second and first commit into one,
-omitting the second's commit message.
\ No newline at end of file
--
GitLab