X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=docs%2Frepository.html;h=95d274a7a2c70bf3b635b4cda07bc6c495af01ad;hb=156fbb9fc530cd2a1d57dc516f67e720ce7f2238;hp=ed385288eab51da475e4af44b11a818a6b3ea2fa;hpb=87a6fe57e85ea5f273e808211a0e61d2b837b8e2;p=mesa.git diff --git a/docs/repository.html b/docs/repository.html index ed385288eab..95d274a7a2c 100644 --- a/docs/repository.html +++ b/docs/repository.html @@ -1,6 +1,6 @@ -
-As of December 5, 2006, Mesa is using -git +Mesa uses git as its source code management system. -CVS was used previously. -The old CVS repository should no longer be used.
The master git repository is hosted on @@ -125,6 +122,83 @@ Questions about branch status/activity should be posted to the mesa3d-dev mailing list. +
+If you try to do a pull by just saying git pull
+and git complains that you have not specified a
+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.
+
++If you are an experienced git user working on substancial modifications, +you are probably +working on a separate branch and would rebase your branch prior to +merging with master. +But for small changes to the master branch itself, +you also need to use the rebase feature in order to avoid an +unnecessary and distracting branch in master. +
++If it has been awhile since you've done the initial clone, try +
+ git pull ++to get the latest files before you start working. + +
+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. + +
+It is possible (and likely) that someone has changed master since +you did your last pull. Even if your changes do not conflict with +their changes, git will make a fast-forward +merge branch, branching from the point in time +where you did your last pull and merging it to a point after the other changes. +
++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.
+
++If the rebase resulted in conflicts or changes that could affect +the proper operation of your changes, you'll need to investigate +those before doing the push. +
++If you want the rebase action to be the default action, then +
+ git config branch.master.rebase true + git config --global branch.autosetuprebase=always ++
+See Understanding Git Conceptually for a fairly clear explanation about all of this. +
+