Skip to content
Snippets Groups Projects
Verified Commit c4496b49 authored by anarcat's avatar anarcat
Browse files

spellcheck

parent 4623b8eb
No related branches found
No related tags found
No related merge requests found
......@@ -442,7 +442,7 @@ the `GITLAB_PRIVATE_TOKEN` environment variable, which should have the
scope `api`.
So, for example, this will rename the `master` branch to `main` on the
local and remote repos:
local and remote repositories:
GITLAB_PRIVATE_TOKEN=REDACTED git-branch-rename-remote
......@@ -458,7 +458,7 @@ repository is already up to date, so there is no need for an access
token.
Other users, then can just run this command will rename `master` to
`main` on the local repo, including remote tracking branches:
`main` on the local repository, including remote tracking branches:
git-branch-rename-remote
......@@ -480,10 +480,10 @@ deleting the old branch.
### Updating gitolite
Many GitLab repositories are mirrored or maintained manually on
gitolite (`git-rw.torproject.org`) and [Gitweb](https://gitweb.torproject.org). The `ssh` step for
the above automation script will fail for gitolite and these steps
Gitolite (`git-rw.torproject.org`) and [Gitweb](https://gitweb.torproject.org). The `ssh` step for
the above automation script will fail for Gitolite and these steps
need to be done manually by a sysadmin. [Open a TPA ticket](https://gitlab.torproject.org/tpo/tpa/team/-/issues/new) with a
list of the gitolite repositories you would like to update and a
list of the Gitolite repositories you would like to update and a
sysadmin will perform the following magic:
cd /srv/git.torproject.org/repositories/
......@@ -492,7 +492,7 @@ sysadmin will perform the following magic:
done
This will update Gitolite, but it won't update Gitweb until the
repositories have been pushed to. To udpate Gitweb immediately, ask
repositories have been pushed to. To update Gitweb immediately, ask
your friendly sysadmin to run the above command on the Gitweb server
as well.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment