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 001dc61a3..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,7 +114,7 @@ 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 rebasing with the ``upstream`` remote: +either fetching and rebasing with the ``upstream`` remote, or fetching and pulling with the ``upstream`` remote: .. code-block:: bash @@ -122,6 +122,13 @@ fetching and rebasing with the ``upstream`` remote: git fetch upstream git rebase -i upstream/dev +or + +.. code-block:: bash + + git fetch upstream dev + git pull upstream/dev + .. _collaborating-on-someone-elses-fork: @@ -137,4 +144,4 @@ nominal workflow for contributing: git fetch git checkout -b / # Make some changes via add/commit cycle - git push \ No newline at end of file + git push