From 83cdcac35535ef122f687f5dcc5f8272dae7b3f0 Mon Sep 17 00:00:00 2001 From: Smile <84652925+SmailBestybay@users.noreply.github.com> Date: Mon, 24 Oct 2022 01:04:38 -0700 Subject: [PATCH] Improved "rebase" example for upstream changes in working with Git docs. --- docs/internals/contributing/writing-code/working-with-git.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/internals/contributing/writing-code/working-with-git.txt b/docs/internals/contributing/writing-code/working-with-git.txt index ab3ab25f26..e1e9d2fa7c 100644 --- a/docs/internals/contributing/writing-code/working-with-git.txt +++ b/docs/internals/contributing/writing-code/working-with-git.txt @@ -196,7 +196,7 @@ When upstream (``django/django``) has changed, you should rebase your work. To do this, use:: git fetch upstream - git rebase + git rebase upstream/main The work is automatically rebased using the branch you forked on, in the example case using ``upstream/main``.