aboutsummaryrefslogtreecommitdiff
path: root/mesalib/docs/repository.html
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-15 08:55:18 +0200
committermarha <marha@users.sourceforge.net>2012-06-15 08:55:18 +0200
commitd6f64084b9bc07d0bdd527f9354f2d1d962ed16d (patch)
tree81b2652d421992fd63143a04885e332e83e18d07 /mesalib/docs/repository.html
parent669b562a737c9418c53bfae69c0dbf1aabe318b4 (diff)
parent7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb (diff)
downloadvcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.gz
vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.bz2
vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.zip
Merge remote-tracking branch 'origin/released'
Conflicts: fontconfig/src/fcint.h fontconfig/src/fcstat.c mesalib/src/mapi/glapi/gen/GL3x.xml xorg-server/glx/glxext.h
Diffstat (limited to 'mesalib/docs/repository.html')
-rw-r--r--mesalib/docs/repository.html37
1 files changed, 19 insertions, 18 deletions
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 @@
-<HTML>
-
-<TITLE>Code Repository</TITLE>
-
-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <title>Code Repository</title>
+ <link rel="stylesheet" type="text/css" href="mesa.css">
+</head>
+<body>
<h1>Code Repository</h1>
@@ -13,6 +14,7 @@ Mesa uses <a href="http://git.or.cz/"target="_parent">git</a>
as its source code management system.
</p>
+<p>
The master git repository is hosted on
<a href="http://www.freedesktop.org" target="_parent">freedesktop.org</a>.
</p>
@@ -33,8 +35,7 @@ target="_parent">Mesa demos and tests git repository</a>.
</p>
-<a name="anonymous">
-<H2>Anonymous git Access</H2>
+<h2 id="anonymous">Anonymous git Access</h2>
<p>
To get the Mesa sources anonymously (read-only):
@@ -57,8 +58,7 @@ To get the Mesa sources anonymously (read-only):
</ol>
-<a name="developer">
-<H2>Developer git Access</H2>
+<h2 id="developer">Developer git Access</h2>
<p>
Mesa developers need to first have an account on
@@ -92,7 +92,7 @@ Once your account is established:
</ol>
-<H2>Windows Users</H2>
+<h2>Windows Users</h2>
<p>
If you're <a href="http://git.or.cz/gitwiki/WindowsInstall" target="_parent">
@@ -113,8 +113,7 @@ Unix users don't need to set this option.
<br>
-<a name="developer">
-<H2>Development Branches</H2>
+<h2>Development Branches</h2>
<p>
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.
</p>
-<H2>Developer Git Tips</H2>
+<h2>Developer Git Tips</h2>
<ol>
<li>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
</pre>
+<p>
Otherwise, you have to say<code> git pull origin master </code>
each time you do a pull.
</p>
@@ -162,6 +162,7 @@ If it has been awhile since you've done the initial clone, try
<pre>
git pull
</pre>
+<p>
to get the latest files before you start working.
</p>
<p>
@@ -170,6 +171,7 @@ Make your changes and use
git add &lt;files to commit&gt;
git commit
</pre>
+<p>
to get your changes ready to push back into the fd.o repository.
</p>
<p>
@@ -185,12 +187,13 @@ To avoid this,
git pull --rebase
git push
</pre>
+<p>
If you are familiar with CVS or similar system, this is similar to doing a
<code> cvs update </code> 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.)
-</br>
+<br>
In any case, your repository now looks like you made your changes after
all the other changes.
</p>
@@ -212,5 +215,3 @@ See <a href="http://www.eecs.harvard.edu/~cduan/technical/git/" target="_parent"
</body>
</html>
-
-