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 09:33:50 +0100 |
| commit | e078747290f0868935f7a865b477629e7b4f4141 (patch) | |
| tree | e0311341c720e066ffb932c0fd63d58f3e660f34 /docs/internals/contributing/committing-code.txt | |
| parent | 3fd83c48db0ef2506ea376417d207f48763c131d (diff) | |
[3.2.x] Updated Git branch "master" to "main".
This change follows a long discussion on django-develops:
https://groups.google.com/g/django-developers/c/tctDuKUGosc/
Backport of d9a266d657f66b8c4fa068408002a4e3709ee669 from main
Diffstat (limited to 'docs/internals/contributing/committing-code.txt')
| -rw-r--r-- | docs/internals/contributing/committing-code.txt | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt index 13c139c5c5..580ea02f52 100644 --- a/docs/internals/contributing/committing-code.txt +++ b/docs/internals/contributing/committing-code.txt @@ -41,27 +41,27 @@ Once you're ready: .. console:: - $ # Pull in the latest changes from master. - $ git checkout master - $ git pull upstream master - $ # Rebase the pull request on master. + $ # Pull in the latest changes from main. + $ git checkout main + $ git pull upstream main + $ # Rebase the pull request on main. $ git checkout pr/#### - $ git rebase master - $ git checkout master - $ # Merge the work as "fast-forward" to master to avoid a merge commit. + $ git rebase main + $ git checkout main + $ # Merge the work as "fast-forward" to main to avoid a merge commit. $ # (in practice, you can omit "--ff-only" since you just rebased) $ git merge --ff-only pr/XXXX $ # If you're not sure if you did things correctly, check that only the $ # changes you expect will be pushed to upstream. - $ git push --dry-run upstream master + $ git push --dry-run upstream main $ # Push! - $ git push upstream master + $ git push upstream main $ # Delete the pull request branch. $ git branch -d pr/xxxx -Force push to the branch after rebasing on master but before merging and -pushing to upstream. This allows the commit hashes on master and the branch to -match which automatically closes the pull request. +Force push to the branch after rebasing on main but before merging and pushing +to upstream. This allows the commit hashes on main and the branch to match +which automatically closes the pull request. If a pull request doesn't need to be merged as multiple commits, you can use GitHub's "Squash and merge" button on the website. Edit the commit message as @@ -189,7 +189,7 @@ Django's Git repository: [1.3.x] Fixed #17028 -- Changed diveintopython.org -> diveintopython.net. - Backport of 80c0cbf1c97047daed2c5b41b296bbc56fe1d7e3 from master. + Backport of 80c0cbf1c97047daed2c5b41b296bbc56fe1d7e3 from main. There's a `script on the wiki <https://code.djangoproject.com/wiki/CommitterTips#AutomatingBackports>`_ |
