diff options
| author | Smile <84652925+SmailBestybay@users.noreply.github.com> | 2022-10-24 01:04:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-24 10:04:38 +0200 |
| commit | 83cdcac35535ef122f687f5dcc5f8272dae7b3f0 (patch) | |
| tree | 19941ab273555c0bbdd278ac630179a494ed2f1f /docs/internals/contributing/writing-code | |
| parent | 577dbcbb4f46df02e1f85179798a1079733c5a97 (diff) | |
Improved "rebase" example for upstream changes in working with Git docs.
Diffstat (limited to 'docs/internals/contributing/writing-code')
| -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``. |