diff --git a/2019/2019-09-09_testCourseAdv/slides/list.json b/2019/2019-09-09_testCourseAdv/slides/list.json index 55cf515dfa95ecd49332a3406f8ace478fb98456..ea4287834f95791b2bcf23b9e41a4a43d109f06f 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 0000000000000000000000000000000000000000..e5c9f722be3cffede4438d644488f9f5ca38ddea --- /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 e5c9f722be3cffede4438d644488f9f5ca38ddea..d836b3e036b7350156062368d4ea49ac2ecb1e9d 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 d836b3e036b7350156062368d4ea49ac2ecb1e9d..0000000000000000000000000000000000000000 --- 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