From d7f49e5d2e97c4c946ca7b3e4b66f30d2e68ecd2 Mon Sep 17 00:00:00 2001 From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu> Date: Tue, 27 Aug 2019 11:01:15 +0200 Subject: [PATCH] adjust example --- .../2019-09-09_testCourseAdv/slides/rebase-iPresentation1.md | 4 ++-- .../2019-09-09_testCourseAdv/slides/rebase-iPresentation2.md | 4 ++-- .../2019-09-09_testCourseAdv/slides/rebase-iPresentation3.md | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation1.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation1.md index e5c9f722..cb57bb84 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation1.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation1.md @@ -6,11 +6,11 @@ ```bash $ echo "Name of one attendee" > attendeeName.md git add attendeeName.md -git commit -m "Add name to the list of attendees" +git commit -m "Add first 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 commit -m "Add second 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 d836b3e0..416d2aa0 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation2.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation2.md @@ -1,9 +1,9 @@ ## Interactive Rebase Workshop -* Perform an interactive rebase onto the develop branch +* Perform an interactive rebase with the two last commits: ```bash -git rebase -i develop +git rebase -i HEAD~2 ``` * reword the first commit's message to: diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation3.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation3.md index f122205d..e4694518 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation3.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation3.md @@ -1,4 +1,7 @@ ## Interactive Rebase Workshop -* Use `git log` to see if the rebase was successful +```bash +reword xxxxxxx add first name to attendee list +fixup yyyyyyy add second name to attendee list +``` -- GitLab