diff options
| author | Stefan van der Walt <stefanv@berkeley.edu> | 2021-03-04 07:11:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-04 09:11:41 -0600 |
| commit | 954605ec08ad833899ffb956395f2d70f8eea2df (patch) | |
| tree | a728df2ab2d8c29e8a36e98cd4a97581e87460ea /doc/source/dev/gitwash/development_setup.rst | |
| parent | 7134dcfe5f43146ffd1ba8d9c58504ec7146ea3f (diff) | |
| download | numpy-954605ec08ad833899ffb956395f2d70f8eea2df.tar.gz | |
MAINT: Update master to main after branch rename (gh-18544)
* Upload docs to main branch of neps/devdocs
* Update `master` to `main` to be consistent with current state of renaming
* Remove badges from README
* Replace remaining instances of `master` with `main`
* Add back logo
* Fix CircleCI branch checks
* Fix GA branch name
* master->main in issue templates.
* master->main for 2 links to numpy archive.
* Change master to main in NEP 23
Co-authored-by: Ross Barnowski <rossbar@berkeley.edu>
Diffstat (limited to 'doc/source/dev/gitwash/development_setup.rst')
| -rw-r--r-- | doc/source/dev/gitwash/development_setup.rst | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/source/dev/gitwash/development_setup.rst b/doc/source/dev/gitwash/development_setup.rst index a7e9c28b9..badb73ca0 100644 --- a/doc/source/dev/gitwash/development_setup.rst +++ b/doc/source/dev/gitwash/development_setup.rst @@ -100,8 +100,8 @@ Make the local copy #. Set up your repository so ``git pull`` pulls from ``upstream`` by default: :: - git config branch.master.remote upstream - git config branch.master.merge refs/heads/master + git config branch.main.remote upstream + git config branch.main.merge refs/heads/main ****************************************************************************** Look it over @@ -109,17 +109,17 @@ Look it over #. The branches shown by ``git branch -a`` will include - - the ``master`` branch you just cloned on your own machine - - the ``master`` branch from your fork on GitHub, which git named + - the ``main`` branch you just cloned on your own machine + - the ``main`` branch from your fork on GitHub, which git named ``origin`` by default - - the ``master`` branch on the the main NumPy repo, which you named + - the ``main`` branch on the the main NumPy repo, which you named ``upstream``. :: - master - remotes/origin/master - remotes/upstream/master + main + remotes/origin/main + remotes/upstream/main If ``upstream`` isn't there, it will be added after you access the NumPy repo with a command like ``git fetch`` or ``git pull``. @@ -139,8 +139,8 @@ Look it over user.name=Your Name remote.origin.url=git@github.com:your-github-id/numpy.git remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* - branch.master.remote=upstream - branch.master.merge=refs/heads/master + branch.main.remote=upstream + branch.main.merge=refs/heads/main remote.upstream.url=https://github.com/numpy/numpy.git remote.upstream.fetch=+refs/heads/*:refs/remotes/upstream/* |