AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docs: Rename master branch to main

Browse Source 
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
This commit is contained in:
Jordan Justen
2021-04-26 13:51:33 -07:00
parent 2ec9cd3104
commit 57897b4095
6 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
docs/repository.rst
View File

@@ -4,7 +4,7 @@ Source Code Repository
Mesa uses `Git <https://git-scm.com>`__ as its source code management
system.
The master Git repository is hosted on
The upstream Git repository is hosted on
`freedesktop.org <https://www.freedesktop.org>`__.
You may access the repository either as an :ref:`anonymous
@@ -30,7 +30,7 @@ To get the Mesa sources anonymously (read-only):
git clone https://gitlab.freedesktop.org/mesa/mesa.git
#. Later, you can update your tree from the master repository with:
#. Later, you can update your tree from the upstream repository with:
.. code-block:: console
@@ -102,7 +102,7 @@ Development Branches
--------------------
At any given time, there may be several active branches in Mesa's
repository. Generally, ``master`` contains the latest development
repository. Generally, ``main`` contains the latest development
(unstable) code while a branch has the latest stable code.
The command ``git branch`` will list all available branches.
@@ -113,27 +113,27 @@ mailing list.
Developer Git Tips
------------------
#. Setting up to edit the master branch
#. Setting up to edit the main branch
If you try to do a pull by just saying\ ``git pull`` and Git
complains that you have not specified a branch, try:
.. code-block:: console
git config branch.master.remote origin
git config branch.master.merge master
git config branch.main.remote origin
git config branch.main.merge main
Otherwise, you have to say\ ``git pull origin master`` each time you
Otherwise, you have to say\ ``git pull origin main`` each time you
do a pull.
#. Small changes to master
#. Small changes to main
If you are an experienced Git user working on substantial
modifications, you are probably working on a separate branch and
would rebase your branch prior to merging with master. But for small
changes to the master branch itself, you also need to use the rebase
would rebase your branch prior to merging with main. But for small
changes to the main branch itself, you also need to use the rebase
feature in order to avoid an unnecessary and distracting branch in
master.
main.
If it has been awhile since you've done the initial clone, try
@@ -153,7 +153,7 @@ Developer Git Tips
to get your changes ready to push back into the freedesktop.org
repository.
It is possible (and likely) that someone has changed master since you
It is possible (and likely) that someone has changed main since you
did your last pull. Even if your changes do not conflict with their
changes, Git will make a fast-forward merge branch, branching from
the point in time where you did your last pull and merging it to a
@@ -183,7 +183,7 @@ Developer Git Tips
.. code-block:: console
git config branch.master.rebase true
git config branch.main.rebase true
git config --global branch.autosetuprebase=always
See `Understanding Git