X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=docs%2Frepository.html;h=e78ffc01fb4a86617008b8471281e75ebfc8f0e3;hb=a1b69d101a60974c105df8519890e3f90fd44911;hp=ad7f90b2604e4801fc4fdf31de09c9dddbdca06b;hpb=9d2d609ccec37a784aef998a93330e7cba25aa7c;p=mesa.git diff --git a/docs/repository.html b/docs/repository.html index ad7f90b2604..e78ffc01fb4 100644 --- a/docs/repository.html +++ b/docs/repository.html @@ -102,7 +102,7 @@ using git on Windows you'll want to enable automatic CR/LF conversion in your local copy of the repository:
- git config --global core.autocrlf true +git config --global core.autocrlf true
@@ -141,8 +141,8 @@ 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 +git config branch.master.remote origin +git config branch.master.merge master
Otherwise, you have to say git pull origin master
@@ -161,7 +161,7 @@ unnecessary and distracting branch in master.
If it has been awhile since you've done the initial clone, try
- git pull +git pull
to get the latest files before you start working. @@ -169,8 +169,8 @@ to get the latest files before you start working.
Make your changes and use
- git add <files to commit> - git commit +git add <files to commit> +git commit
to get your changes ready to push back into the fd.o repository. @@ -185,8 +185,8 @@ where you did your last pull and merging it to a point after the other changes.
To avoid this,
- git pull --rebase - git push +git pull --rebase +git push
If you are familiar with CVS or similar system, this is similar to doing a @@ -207,8 +207,8 @@ 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 +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.