From 643fdd9697f2c7bf07da94c2355a6be7ac2f50ae Mon Sep 17 00:00:00 2001 From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu> Date: Tue, 27 Aug 2019 10:45:41 +0200 Subject: [PATCH] compact slides --- .../slides/rebase-iPresentation4.md | 8 ++++++-- .../slides/rebase-iPresentation5.md | 6 ------ 2 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation5.md diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation4.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation4.md index 3eacea18..d836b3e0 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation4.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation4.md @@ -1,8 +1,12 @@ ## Interactive Rebase Workshop -* Perform an interactive rebase onto the master branch +* Perform an interactive rebase onto the develop branch ```bash -git rebase -i master +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 diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation5.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation5.md deleted file mode 100644 index ab6379f9..00000000 --- a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation5.md +++ /dev/null @@ -1,6 +0,0 @@ -## Interactive Rebase Workshop - -* 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. -- GitLab