diff options
| author | Markus Holtermann <info@markusholtermann.eu> | 2021-02-25 10:52:48 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2021-03-09 08:48:32 +0100 |
| commit | d9a266d657f66b8c4fa068408002a4e3709ee669 (patch) | |
| tree | b10eff95f3bef9840753d72609c4658001de9b22 /docs/internals/contributing/writing-code/working-with-git.txt | |
| parent | a124365de80bd633e24f692e7ecaa5c84c12182d (diff) | |
Updated Git branch "master" to "main".
This change follows a long discussion on django-develops:
https://groups.google.com/g/django-developers/c/tctDuKUGosc/
Diffstat (limited to 'docs/internals/contributing/writing-code/working-with-git.txt')
| -rw-r--r-- | docs/internals/contributing/writing-code/working-with-git.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/internals/contributing/writing-code/working-with-git.txt b/docs/internals/contributing/writing-code/working-with-git.txt index 5f1ffb5166..9b8713b476 100644 --- a/docs/internals/contributing/writing-code/working-with-git.txt +++ b/docs/internals/contributing/writing-code/working-with-git.txt @@ -69,9 +69,9 @@ Working on a ticket =================== When working on a ticket, create a new branch for the work, and base that work -on upstream/master:: +on ``upstream/main``:: - git checkout -b ticket_xxxxx upstream/master + git checkout -b ticket_xxxxx upstream/main The -b flag creates a new branch for you locally. Don't hesitate to create new branches even for the smallest things - that's what they are there for. @@ -115,7 +115,7 @@ their clone would become corrupt when you edit commits. There are also "public branches". These are branches other people are supposed to fork, so the history of these branches should never change. Good examples -of public branches are the ``master`` and ``stable/A.B.x`` branches in the +of public branches are the ``main`` and ``stable/A.B.x`` branches in the ``django/django`` repository. When you think your work is ready to be pulled into Django, you should create @@ -200,7 +200,7 @@ do this, use:: git rebase The work is automatically rebased using the branch you forked on, in the -example case using ``upstream/master``. +example case using ``upstream/main``. The rebase command removes all your local commits temporarily, applies the upstream commits, and then applies your local commits again on the work. @@ -255,7 +255,7 @@ One of the ways that developers can contribute to Django is by reviewing patches. Those patches will typically exist as pull requests on GitHub and can be easily integrated into your local repository:: - git checkout -b pull_xxxxx upstream/master + git checkout -b pull_xxxxx upstream/main curl https://github.com/django/django/pull/xxxxx.patch | git am This will create a new branch and then apply the changes from the pull request |