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">
10 <h1>Code Repository</h1>
13 Mesa uses <a href="http://git.or.cz/"target="_parent">git</a>
14 as its source code management system.
18 The master git repository is hosted on
19 <a href="http://www.freedesktop.org" target="_parent">freedesktop.org</a>.
23 You may access the repository either as an
24 <a href="#anonymous">anonymous user</a> (read-only) or as a
25 <a href="#developer">developer</a>
31 <a href="http://cgit.freedesktop.org/mesa/mesa/"
32 target="_parent">browse the main Mesa git repository</a> and the
33 <a href="http://cgit.freedesktop.org/mesa/demos"
34 target="_parent">Mesa demos and tests git repository</a>.
38 <h2 id="anonymous">Anonymous git Access</h2>
41 To get the Mesa sources anonymously (read-only):
45 <li>Install the git software on your computer if needed.<br><br>
46 <li>Get an initial, local copy of the repository with:
48 git clone git://anongit.freedesktop.org/git/mesa/mesa
50 <li>Later, you can update your tree from the master repository with:
54 <li>If you also want the Mesa demos/tests repository:
56 git clone git://anongit.freedesktop.org/git/mesa/demos
61 <h2 id="developer">Developer git Access</h2>
64 Mesa developers need to first have an account on
65 <a href="http://www.freedesktop.org" target="_parent">freedesktop.org</a>.
66 To get an account, please ask Brian or the other Mesa developers for
68 Then, if there are no objections, follow this
69 <a href="http://www.freedesktop.org/wiki/AccountRequests" target="_parent">
74 Once your account is established:
78 <li>Install the git software on your computer if needed.<br><br>
79 <li>Get an initial, local copy of the repository with:
81 git clone git+ssh://username@git.freedesktop.org/git/mesa/mesa
83 Replace <em>username</em> with your actual login name.<br><br>
84 <li>Later, you can update your tree from the master repository with:
88 <li>If you also want the Mesa demos/tests repository:
90 git clone git+ssh://username@git.freedesktop.org/git/mesa/demos
95 <h2>Windows Users</h2>
98 If you're <a href="http://git.or.cz/gitwiki/WindowsInstall" target="_parent">
99 using git on Windows</a> you'll want to enable automatic CR/LF conversion in
100 your local copy of the repository:
103 git config --global core.autocrlf true
107 This will cause git to convert all text files to CR+LF on checkout,
111 Unix users don't need to set this option.
116 <h2>Development Branches</h2>
119 At any given time, there may be several active branches in Mesa's
121 Generally, the trunk contains the latest development (unstable)
122 code while a branch has the latest stable code.
126 The command <code>git-branch</code> will list all available branches.
130 Questions about branch status/activity should be posted to the
131 mesa3d-dev mailing list.
134 <h2>Developer Git Tips</h2>
137 <li>Setting up to edit the master branch
139 If you try to do a pull by just saying<code> git pull </code>
140 and git complains that you have not specified a
143 git config branch.master.remote origin
144 git config branch.master.merge master
147 Otherwise, you have to say<code> git pull origin master </code>
148 each time you do a pull.
150 <li>Small changes to master
152 If you are an experienced git user working on substancial modifications,
154 working on a separate branch and would rebase your branch prior to
156 But for small changes to the master branch itself,
157 you also need to use the rebase feature in order to avoid an
158 unnecessary and distracting branch in master.
161 If it has been awhile since you've done the initial clone, try
166 to get the latest files before you start working.
169 Make your changes and use
171 git add <files to commit>
175 to get your changes ready to push back into the fd.o repository.
178 It is possible (and likely) that someone has changed master since
179 you did your last pull. Even if your changes do not conflict with
180 their changes, git will make a fast-forward
181 merge branch, branching from the point in time
182 where you did your last pull and merging it to a point after the other changes.
191 If you are familiar with CVS or similar system, this is similar to doing a
192 <code> cvs update </code> in order to update your source tree to
193 the current repository state, instead of the time you did the last update.
194 (CVS doesn't work like git in this respect, but this is easiest way
197 In any case, your repository now looks like you made your changes after
198 all the other changes.
201 If the rebase resulted in conflicts or changes that could affect
202 the proper operation of your changes, you'll need to investigate
203 those before doing the push.
206 If you want the rebase action to be the default action, then
208 git config branch.master.rebase true
209 git config --global branch.autosetuprebase=always
212 See <a href="http://www.eecs.harvard.edu/~cduan/technical/git/" target="_parent">Understanding Git Conceptually</a> for a fairly clear explanation about all of this.