diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation4.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation4.md index 3eacea18b8925e49a57f3d3ca5e2a8a29377814a..d836b3e036b7350156062368d4ea49ac2ecb1e9d 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 ab6379f917f4ad3b674299f43a3f6490d1e81816..0000000000000000000000000000000000000000 --- 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.