diff --git a/2019/2019-10-10_advancedGitTraining-SIU/slides/gettingStarted.md b/2019/2019-10-10_advancedGitTraining-SIU/slides/gettingStarted.md index 07181df4432645ce5ac8268e4c22e6f0b9c33125..39353bb49b7fa60b6ea3568452e5cc43fb3734d9 100644 --- a/2019/2019-10-10_advancedGitTraining-SIU/slides/gettingStarted.md +++ b/2019/2019-10-10_advancedGitTraining-SIU/slides/gettingStarted.md @@ -11,7 +11,7 @@ ```bash $ cd advanced-git-practice # add upstream URL - $ git remote add upstream git@github.com:<first.last>/advanced-git-practice.git + $ git remote add upstream git@github.com:LCSB-BioCore/advanced-git-practice.git $ git fetch upstream ``` * Check the remotes with: diff --git a/2019/2019-10-10_advancedGitTraining-SIU/slides/overview.md b/2019/2019-10-10_advancedGitTraining-SIU/slides/overview.md index 3b769f404405e775441c2d5d5492abf7a39ef80c..f6631a0af56f1768ed31cbce1a693d6c3fa04c01 100644 --- a/2019/2019-10-10_advancedGitTraining-SIU/slides/overview.md +++ b/2019/2019-10-10_advancedGitTraining-SIU/slides/overview.md @@ -2,16 +2,18 @@ 1. Installation and getting started -2. Amend last commit +2. Ignoring files -3. Resetting to a previous commit +3. Amend last commit -4. Reverting commits +4. Resetting to a previous commit -5. Rebasing in Git +5. Reverting commits -6. Git cherry-picking +6. Rebasing in Git -7. Merging branches +7. Git cherry-picking -8. Conflict Resolution +8. Merging branches + +9. Conflict Resolution