X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=docs%2Frepository.html;h=bb0ae008e5c2276acbcee9041b54b2c4eda25aa9;hb=ae9f73ea40094fe3010b3a774595f72fe87a10db;hp=95d274a7a2c70bf3b635b4cda07bc6c495af01ad;hpb=207ad94a8952c204ac7a6339ed21f0f2eae414e0;p=mesa.git diff --git a/docs/repository.html b/docs/repository.html index 95d274a7a2c..bb0ae008e5c 100644 --- a/docs/repository.html +++ b/docs/repository.html @@ -1,20 +1,29 @@ - - -Code Repository - - - - + + + + + Code Repository + + + + +
+

The Mesa 3D Graphics Library

+
+ + +

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.

@@ -26,13 +35,14 @@ You may access the repository either as an

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

- -

Anonymous git Access

+

Anonymous git Access

To get the Mesa sources anonymously (read-only): @@ -48,19 +58,22 @@ To get the Mesa sources anonymously (read-only): 

     git pull origin
+
  • If you also want the Mesa demos/tests repository: + 
    +    git clone git://anongit.freedesktop.org/git/mesa/demos
+
    -     -

    Developer git Access

    +

    Developer git Access

    Mesa developers need to first have an account on -freedesktop.org. +freedesktop.org. To get an account, please ask Brian or the other Mesa developers for permission. Then, if there are no objections, follow this - + procedure.

    @@ -79,13 +92,17 @@ Once your account is established: 
         git pull origin
    +
  • If you also want the Mesa demos/tests repository: + 
    +    git clone git+ssh://username@git.freedesktop.org/git/mesa/demos
+
    -

    Windows Users

    +

    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:

    @@ -103,8 +120,7 @@ Unix users don't need to set this option.
    - -

    Development Branches

    +

    Development Branches

    At any given time, there may be several active branches in Mesa's @@ -122,7 +138,7 @@ Questions about branch status/activity should be posted to the mesa3d-dev mailing list.

    -

    Developer Git Tips

    +

    Developer Git Tips

    1. Setting up to edit the master branch @@ -134,12 +150,13 @@ branch, try: git config branch.master.remote origin git config branch.master.merge master +

      Otherwise, you have to say git pull origin master each time you do a pull.

    2. Small changes to master

      -If you are an experienced git user working on substancial modifications, +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. @@ -152,6 +169,7 @@ If it has been awhile since you've done the initial clone, try 

           git pull
      +

      to get the latest files before you start working.

      @@ -160,6 +178,7 @@ Make your changes and use git add <files to commit> git commit +

      to get your changes ready to push back into the fd.o repository.

      @@ -175,12 +194,13 @@ To avoid this, git pull --rebase git push +

      If you are familiar with CVS or similar system, this is similar to doing a cvs update in order to update your source tree to 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.

      @@ -196,11 +216,10 @@ 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.

    +
    • - -