From 351bbaedbe5b58de9c3987acd7e228c649e5942b Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Fri, 19 Feb 2021 15:33:04 +0100
Subject: [PATCH] fix git documentation
---
devNotes/gitSetup.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/devNotes/gitSetup.md b/devNotes/gitSetup.md
index 42a5bff0c10..022c3049b5e 100644
--- a/devNotes/gitSetup.md
+++ b/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>`
--
GitLab