diff --git a/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md b/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md index c00a6bb7138b8f77045182e258d0d8d3c9078762..174ed15e7da27cea274d5405a5335dcc52e35265 100644 --- a/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md +++ b/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md @@ -1,4 +1,4 @@ -## Cherry picking commits +## Cherry Picking Commits Cherry picking is another very useful tool to work with. It enables the user to pick specific commits from a diff --git a/2019/2019-09-09_testCourseAdv/slides/chPickPresentation.md b/2019/2019-09-09_testCourseAdv/slides/chPickPresentation.md new file mode 100644 index 0000000000000000000000000000000000000000..9fcad4588ae85fbe495306e495c137a9001f8115 --- /dev/null +++ b/2019/2019-09-09_testCourseAdv/slides/chPickPresentation.md @@ -0,0 +1,12 @@ +## Cherry Picking Commits + +Let's take our branch A and say it has a row of commits. +If only certain of these commits are important for a +second branch B, using the command + +```bash +git cherry-pick ZZ +``` + +we can take only the relevant changes from A and merge them +into B \ No newline at end of file diff --git a/2019/2019-09-09_testCourseAdv/slides/list.json b/2019/2019-09-09_testCourseAdv/slides/list.json index 4e929e2fdfaa42b196b24282f2f43620a9c1be00..d764a7ebdc1638c748a23c638c298c71521d7dde 100644 --- a/2019/2019-09-09_testCourseAdv/slides/list.json +++ b/2019/2019-09-09_testCourseAdv/slides/list.json @@ -29,6 +29,11 @@ "attr": { } }, + { + "filename": "chPickPresentation.md", + "attr": { + } + }, { "filename": "thanks.md", "attr": {