diff --git a/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md b/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md index 60ac481db4704f6abadb0e6228c40a640aa35986..785945db1d2ff844795be7c04cbb447bcfe4dbf7 100644 --- a/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md +++ b/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md @@ -1,4 +1,4 @@ -## Git Cherry-pick +## Cherry-picking * Cherry picking is another very useful tool to work with. * It enables the user to pick specific commits from a list of commits. diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation3.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation3.md index d02b2fa7e7ce6e6421d105966b3166249081394c..41c9f1331c869b79dd1fab5f05e4fee866ed8efb 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation3.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation3.md @@ -3,18 +3,18 @@ The prompt shows up: ```bash -$ pick 93fshjw add first name to attendee list -$ pick 47fh35f add second name to attendee list +$ pick 1234567 add first name to attendee list +$ pick 890abcd add second name to attendee list ``` The keywords should be changed to: ```bash -$ reword 93fshjw add first name to attendee list -$ fixup 47fh35f add second name to attendee list +$ reword 1234567 add first name to attendee list +$ fixup 890abcd add second name to attendee list ``` -Upon confirming, change the message of commit 93fshjw: +Upon confirming, change the message of commit 1234567: ```bash $ Add Name1 and Name2 to the attendee list