1 <!DOCTYPE HTML PUBLIC
"-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
4 <meta http-equiv=
"content-type" content=
"text/html; charset=utf-8">
5 <title>Code Repository
</title>
6 <link rel=
"stylesheet" type=
"text/css" href=
"mesa.css">
11 <h1>The Mesa
3D Graphics Library
</h1>
14 <iframe src=
"contents.html"></iframe>
17 <h1>Code Repository
</h1>
20 Mesa uses
<a href=
"http://git-scm.com">git
</a>
21 as its source code management system.
25 The master git repository is hosted on
26 <a href=
"http://www.freedesktop.org">freedesktop.org
</a>.
30 You may access the repository either as an
31 <a href=
"#anonymous">anonymous user
</a> (read-only) or as a
32 <a href=
"#developer">developer
</a>
38 <a href=
"http://cgit.freedesktop.org/mesa/mesa/"
39 >browse the main Mesa git repository
</a> and the
40 <a href=
"http://cgit.freedesktop.org/mesa/demos"
41 >Mesa demos and tests git repository
</a>.
45 <h2 id=
"anonymous">Anonymous git Access
</h2>
48 To get the Mesa sources anonymously (read-only):
52 <li>Install the git software on your computer if needed.
<br><br>
53 <li>Get an initial, local copy of the repository with:
55 git clone git://anongit.freedesktop.org/git/mesa/mesa
57 <li>Later, you can update your tree from the master repository with:
61 <li>If you also want the Mesa demos/tests repository:
63 git clone git://anongit.freedesktop.org/git/mesa/demos
68 <h2 id=
"developer">Developer git Access
</h2>
71 Mesa developers need to first have an account on
72 <a href=
"http://www.freedesktop.org">freedesktop.org
</a>.
73 To get an account, please ask Brian or the other Mesa developers for
75 Then, if there are no objections, follow this
76 <a href=
"http://www.freedesktop.org/wiki/AccountRequests">
81 Once your account is established:
85 <li>Install the git software on your computer if needed.
<br><br>
86 <li>Get an initial, local copy of the repository with:
88 git clone git+ssh://username@git.freedesktop.org/git/mesa/mesa
90 Replace
<em>username
</em> with your actual login name.
<br><br>
91 <li>Later, you can update your tree from the master repository with:
95 <li>If you also want the Mesa demos/tests repository:
97 git clone git+ssh://username@git.freedesktop.org/git/mesa/demos
102 <h2>Windows Users
</h2>
105 If you're
<a href=
"http://git.wiki.kernel.org/index.php/WindowsInstall">
106 using git on Windows
</a> you'll want to enable automatic CR/LF conversion in
107 your local copy of the repository:
110 git config --global core.autocrlf true
114 This will cause git to convert all text files to CR+LF on checkout,
118 Unix users don't need to set this option.
123 <h2>Development Branches
</h2>
126 At any given time, there may be several active branches in Mesa's
128 Generally, the trunk contains the latest development (unstable)
129 code while a branch has the latest stable code.
133 The command
<code>git-branch
</code> will list all available branches.
137 Questions about branch status/activity should be posted to the
138 mesa3d-dev mailing list.
141 <h2>Developer Git Tips
</h2>
144 <li>Setting up to edit the master branch
146 If you try to do a pull by just saying
<code> git pull
</code>
147 and git complains that you have not specified a
150 git config branch.master.remote origin
151 git config branch.master.merge master
154 Otherwise, you have to say
<code> git pull origin master
</code>
155 each time you do a pull.
157 <li>Small changes to master
159 If you are an experienced git user working on substantial modifications,
161 working on a separate branch and would rebase your branch prior to
163 But for small changes to the master branch itself,
164 you also need to use the rebase feature in order to avoid an
165 unnecessary and distracting branch in master.
168 If it has been awhile since you've done the initial clone, try
173 to get the latest files before you start working.
176 Make your changes and use
178 git add
<files to commit
>
182 to get your changes ready to push back into the fd.o repository.
185 It is possible (and likely) that someone has changed master since
186 you did your last pull. Even if your changes do not conflict with
187 their changes, git will make a fast-forward
188 merge branch, branching from the point in time
189 where you did your last pull and merging it to a point after the other changes.
198 If you are familiar with CVS or similar system, this is similar to doing a
199 <code> cvs update
</code> in order to update your source tree to
200 the current repository state, instead of the time you did the last update.
201 (CVS doesn't work like git in this respect, but this is easiest way
204 In any case, your repository now looks like you made your changes after
205 all the other changes.
208 If the rebase resulted in conflicts or changes that could affect
209 the proper operation of your changes, you'll need to investigate
210 those before doing the push.
213 If you want the rebase action to be the default action, then
215 git config branch.master.rebase true
216 git config --global branch.autosetuprebase=always
219 See
<a href=
"http://www.eecs.harvard.edu/~cduan/technical/git/">Understanding Git Conceptually
</a> for a fairly clear explanation about all of this.