From 7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 15 Jun 2012 08:28:24 +0200 Subject: fontconfig mesa pixman xserver git update 15 juni 2012 --- mesalib/docs/repository.html | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'mesalib/docs/repository.html') diff --git a/mesalib/docs/repository.html b/mesalib/docs/repository.html index bdd2b577b..3e05871fd 100644 --- a/mesalib/docs/repository.html +++ b/mesalib/docs/repository.html @@ -1,10 +1,11 @@ - - -Code Repository - - - - + + + + + Code Repository + + +

Code Repository

@@ -13,6 +14,7 @@ Mesa uses git as its source code management system.

The master git repository is hosted on freedesktop.org.

@@ -33,8 +35,7 @@ target="_parent">Mesa demos and tests git repository.

- -

Anonymous git Access

To get the Mesa sources anonymously (read-only): @@ -57,8 +58,7 @@ To get the Mesa sources anonymously (read-only): - -

Developer git Access

Mesa developers need to first have an account on @@ -92,7 +92,7 @@ Once your account is established: -

Windows Users

If you're @@ -113,8 +113,7 @@ Unix users don't need to set this option.
- -

Development Branches

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

Developer Git Tips

Setting up to edit the master branch @@ -144,6 +143,7 @@ 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.
@@ -162,6 +162,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.

@@ -170,6 +171,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.

@@ -185,12 +187,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.
@@ -212,5 +215,3 @@ See
- - -- cgit v1.2.3