Skip to content

Commit a7ee5ad

Browse files
committed
rename mpmaster branch to upstream
1 parent 5352559 commit a7ee5ad

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

docs_rst/contributing.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ Direct contributions to pymatgen main distribution
4141
pip install -e '.[dev,optional]'
4242

4343
6. Code (see `Coding Guidelines`_). Commit early and commit often. Keep your code up to date. You need to add the main
44-
repository to the list of your remotes. Let's name the upstream repo as mpmaster (materialsproject master)::
44+
repository to the list of your remotes. Let's name the upstream repo as upstream (materialsproject master)::
4545

46-
git remote add mpmaster git://github.com/materialsproject/pymatgen.git
46+
git remote add upstream git://github.com/materialsproject/pymatgen.git
4747

4848
Make sure your repository is clean (no uncommitted changes) and is currently on the master branch. If not, commit or
4949
stash any changes and switch to the master::
@@ -52,7 +52,7 @@ Direct contributions to pymatgen main distribution
5252

5353
Then you can pull all the new commits from the main line::
5454

55-
git pull mpmaster master
55+
git pull upstream master
5656

5757
Remember, pull is a combination of the commands fetch and merge, so there may be merge conflicts that may need to be
5858
manually resolved.

0 commit comments

Comments
 (0)