From f83b5e251f642df051c3eba97ff58405449277bd Mon Sep 17 00:00:00 2001
From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu>
Date: Wed, 21 Aug 2019 15:26:32 +0200
Subject: [PATCH] create chPickPresentation.md
---
2019/2019-09-09_testCourseAdv/slides/chPickIntro.md | 2 +-
.../slides/chPickPresentation.md | 12 ++++++++++++
2019/2019-09-09_testCourseAdv/slides/list.json | 5 +++++
3 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 2019/2019-09-09_testCourseAdv/slides/chPickPresentation.md
diff --git a/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md b/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md
index c00a6bb7..174ed15e 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 00000000..9fcad458
--- /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 4e929e2f..d764a7eb 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": {
--
GitLab