diff --git a/docs/source/development-guide/style-guide/git-and-github-workflow.rst b/docs/source/development-guide/style-guide/git-and-github-workflow.rst
index cb9522e92..9ab4c56b8 100644
--- a/docs/source/development-guide/style-guide/git-and-github-workflow.rst
+++ b/docs/source/development-guide/style-guide/git-and-github-workflow.rst
@@ -114,11 +114,18 @@ Keeping your fork updated
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 You can keep your personal fork up-to-date with the ``IMAP-Science-Operations-Center`` ``imap_processing`` repository by
-fetching and pulling the ``upstream`` remote:
+either fetching and rebasing with the ``upstream`` remote, or fetching and pulling with the ``upstream`` remote:
 
 .. code-block:: bash
 
     git checkout dev
+    git fetch upstream
+    git rebase -i upstream/dev
+
+or
+
+.. code-block:: bash
+
     git fetch upstream dev
     git pull upstream/dev
 
@@ -137,4 +144,4 @@ nominal workflow for contributing:
     git fetch <username>
     git checkout -b <branchname> <username>/<branchname>
     # Make some changes via add/commit cycle
-    git push <username> <branchname>
\ No newline at end of file
+    git push <username> <branchname>