From 7b7a63c74a72d2e65d005bd413e00cefd3b5ebcd Mon Sep 17 00:00:00 2001 From: laurentheirendt <laurent.heirendt@uni.lu> Date: Fri, 20 Sep 2019 17:54:15 +0200 Subject: [PATCH] change overview list --- .../slides/overview.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/2019/2019-09-24_advancedGitTraining/slides/overview.md b/2019/2019-09-24_advancedGitTraining/slides/overview.md index 39b55e41..556caad9 100644 --- a/2019/2019-09-24_advancedGitTraining/slides/overview.md +++ b/2019/2019-09-24_advancedGitTraining/slides/overview.md @@ -1,9 +1,15 @@ # Overview -1. Rebasing in Git -2. Git cherry-picking +1. Amend last commit + +2. Resetting to a previous commit + 3. Reverting commits -4. Resetting to a previous commit -5. Amend last commit -7. Merging branches -8. Conflict Resolution + +4. Rebasing in Git + +5. Git cherry-picking + +6. Merging branches + +7. Conflict Resolution -- GitLab