X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=docs%2Frepository.html;h=6f8d65ce366a4399fac3bf6ae5afa78b2f1e2d70;hb=9d988f92919afa08037b9bd8cc9ebbf691982a13;hp=714074f1976d3ea490310d75e2e493ef7b675fca;hpb=4da0d1c59a6e42e56036827328b98d72d3f4a8e0;p=mesa.git diff --git a/docs/repository.html b/docs/repository.html index 714074f1976..6f8d65ce366 100644 --- a/docs/repository.html +++ b/docs/repository.html @@ -2,28 +2,28 @@ - Code Repository + Source Code Repository
-

The Mesa 3D Graphics Library

+ The Mesa 3D Graphics Library
-

Code Repository

+

Source Code Repository

-Mesa uses git +Mesa uses git as its source code management system.

The master git repository is hosted on -freedesktop.org. +freedesktop.org.

@@ -35,9 +35,9 @@ You may access the repository either as an

You may also -browse the main Mesa git repository and the -Mesa demos and tests git repository.

@@ -49,19 +49,13 @@ To get the Mesa sources anonymously (read-only):

    -
  1. Install the git software on your computer if needed.

    +
  2. Install the git software on your computer if needed.
  3. Get an initial, local copy of the repository with: - 
    -    git clone git://anongit.freedesktop.org/git/mesa/mesa
-
    + 
    git clone https://gitlab.freedesktop.org/mesa/mesa.git
  4. Later, you can update your tree from the master repository with: - 
    -    git pull origin
-
    + 
    git pull origin
  5. If you also want the Mesa demos/tests repository: - 
    -    git clone git://anongit.freedesktop.org/git/mesa/demos
-
    + 
    git clone https://gitlab.freedesktop.org/mesa/demos.git
@@ -73,7 +67,7 @@ follow this procedure:

  1. Subscribe to the -mesa-dev +mesa-dev mailing list.
  2. Start contributing to the project by submitting patches to @@ -92,36 +86,29 @@ only if they're being supervised by another Mesa developer at the same organization and planning to work in a limited area of the code or on a separate branch.
  3. To apply for an account, follow -these directions. +these directions. It's also appreciated if you briefly describe what you intend to do (work on a particular driver, add a new extension, etc.) in the bugzilla record.

-Once your account is established: -

+Once your account is established, you can update your push url to use SSH: +
+git remote set-url --push origin git@gitlab.freedesktop.org:mesa/mesa.git
+
-
    -
  1. Get an initial, local copy of the repository with: - 
    -    git clone git+ssh://username@git.freedesktop.org/git/mesa/mesa
-
    - Replace username with your actual login name.

    -
  2. Later, you can update your tree from the master repository with: - 
    -    git pull origin
-
    -
  3. If you also want the Mesa demos/tests repository: - 
    -    git clone git+ssh://username@git.freedesktop.org/git/mesa/demos
-
    -
+You can also use personal access tokens +to push over HTTPS instead (useful for people behind strict proxies). +In this case, create a token, and put it in the url as shown here: +
+git remote set-url --push origin https://USER:TOKEN@gitlab.freedesktop.org/mesa/mesa.git
+

Windows Users

-If you're +If you're using git on Windows you'll want to enable automatic CR/LF conversion in your local copy of the repository:

@@ -136,7 +123,6 @@ and to LF on commit.

Unix users don't need to set this option.

-

Development Branches

@@ -144,17 +130,17 @@ Unix users don't need to set this option.

At any given time, there may be several active branches in Mesa's repository. -Generally, master contains the latest development (unstable) +Generally, master contains the latest development (unstable) code while a branch has the latest stable code.

-The command git-branch will list all available branches. +The command git branch will list all available branches.

Questions about branch status/activity should be posted to the -mesa3d-dev mailing list. +mesa-dev mailing list.

Developer Git Tips

@@ -219,7 +205,8 @@ If you are familiar with CVS or similar system, this is similar to doing a the current repository state, instead of the time you did the last update. (CVS doesn't work like git in this respect, but this is easiest way to explain it.) -
+

+

In any case, your repository now looks like you made your changes after all the other changes.

@@ -235,7 +222,7 @@ If you want the rebase action to be the default action, then git config --global branch.autosetuprebase=always

-See Understanding Git Conceptually for a fairly clear explanation about all of this. +See Understanding Git Conceptually for a fairly clear explanation about all of this.