Merge branch 'git' into 'pregmod-master'

fix git documentation

See merge request pregmodfan/fc-pregmod!8916

devNotes/gitSetup.md

@@ -28,14 +28,14 @@
 7. Checkout `pregmod-master`
     * Via terminal: `git checkout pregmod-master`
 
-8. Make sure `fc-pregmod` tracks `upstream/master`
+8. Make sure `fc-pregmod` tracks `upstream/pregmod-master`
     * Via terminal: `git branch -u upstream/pregmod-master`
 
 ## Typical cycle with Git:
 
 1. Get changes from upstream
     * Via terminal: `git pull`
-    * If you don't get new commits from `upstream` repeat steps 4&5 of the setup.
+    * If you don't get new commits from `upstream` repeat steps 7 & 8 of the setup.
 
 2. Checkout a new branch for your work
     * Via terminal: `git checkout -b <branch-name>`