mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-06 22:46:41 +00:00
Code Issues 32 Releases Wiki Activity

[4.1.x] Improved "rebase" example for upstream changes in working with Git docs.

Browse Source 
Backport of 83cdcac35535ef122f687f5dcc5f8272dae7b3f0 from main
This commit is contained in:
Smile 2022-10-24 01:04:38 -07:00 committed by Mariusz Felisiak
parent 72e74e46af
commit 6ddb5aef98
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/internals/contributing/writing-code/working-with-git.txt
View File

@ -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``.