diff options
| author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2020-01-16 20:18:07 +0100 |
|---|---|---|
| committer | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2020-01-18 11:39:18 +0100 |
| commit | 9954120b38e5dcff54bb73b0f0a56f158e050f35 (patch) | |
| tree | 2d9c33b1b01689f351dfb4a09458ecc107565b10 /docs/repository.html | |
| parent | c8718627443cd8cfde0b6969f6a2f1d9e6deb88b (diff) | |
| download | mesa-9954120b38e5dcff54bb73b0f0a56f158e050f35.tar.gz | |
docs: remove leading spaces
There's no good reason to have leading space in these pre-formatted
blocks. It looks strange, so let's get rid of it.
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3443>
Diffstat (limited to 'docs/repository.html')
| -rw-r--r-- | docs/repository.html | 20 |
1 files changed, 10 insertions, 10 deletions
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</a> you'll want to enable automatic CR/LF conversion in your local copy of the repository: </p> <pre> - git config --global core.autocrlf true +git config --global core.autocrlf true </pre> <p> @@ -141,8 +141,8 @@ If you try to do a pull by just saying<code> git pull </code> and git complains that you have not specified a branch, try: <pre> - git config branch.master.remote origin - git config branch.master.merge master +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> @@ -161,7 +161,7 @@ unnecessary and distracting branch in master. <p> If it has been awhile since you've done the initial clone, try <pre> - git pull +git pull </pre> <p> to get the latest files before you start working. @@ -169,8 +169,8 @@ to get the latest files before you start working. <p> Make your changes and use <pre> - git add <files to commit> - git commit +git add <files to commit> +git commit </pre> <p> 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. <p> To avoid this, <pre> - git pull --rebase - git push +git pull --rebase +git push </pre> <p> If you are familiar with CVS or similar system, this is similar to doing a @@ -207,8 +207,8 @@ those before doing the push. <p> If you want the rebase action to be the default action, then <pre> - git config branch.master.rebase true - git config --global branch.autosetuprebase=always +git config branch.master.rebase true +git config --global branch.autosetuprebase=always </pre> <p> See <a href="https://www.eecs.harvard.edu/~cduan/technical/git/">Understanding Git Conceptually</a> for a fairly clear explanation about all of this. |