diff --git a/2019/2019-09-24_advancedGitTraining/slides/overview.md b/2019/2019-09-24_advancedGitTraining/slides/overview.md index 39b55e411c722f9df659a8282c006b9d8b66a584..556caad9afaab3c2328c1a09ed0b617bc0a910f1 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