diff options
| author | Smile <84652925+SmailBestybay@users.noreply.github.com> | 2022-10-24 01:04:38 -0700 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2022-10-24 10:04:56 +0200 |
| commit | 6ddb5aef989e2af332d3798d4154994b6f819dfe (patch) | |
| tree | 8bb87bcecbf448a737b7c64dd511f55ef5f653d5 /docs/internals/contributing/writing-code/working-with-git.txt | |
| parent | 72e74e46afda713a48f18c6f8630d60c64f3bc8a (diff) | |
[4.1.x] Improved "rebase" example for upstream changes in working with Git docs.
Backport of 83cdcac35535ef122f687f5dcc5f8272dae7b3f0 from main
Diffstat (limited to 'docs/internals/contributing/writing-code/working-with-git.txt')
| -rw-r--r-- | docs/internals/contributing/writing-code/working-with-git.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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``. |