diff options
| author | Shitian Ni <shitian.ni@gmail.com> | 2017-05-25 18:12:09 +0900 |
|---|---|---|
| committer | Shitian Ni <shitian.ni@gmail.com> | 2017-05-25 18:12:09 +0900 |
| commit | 9d48c354f483567769c5e789a4247ef706cebcc4 (patch) | |
| tree | e4cb6cbf914e708e126d9d56d89a2d992dbf7dc7 /doc/source/dev/gitwash | |
| parent | cb731dc603969687eef781216c046f1857fabc1f (diff) | |
| download | numpy-9d48c354f483567769c5e789a4247ef706cebcc4.tar.gz | |
git:// to https://
Diffstat (limited to 'doc/source/dev/gitwash')
| -rw-r--r-- | doc/source/dev/gitwash/development_setup.rst | 20 | ||||
| -rw-r--r-- | doc/source/dev/gitwash/git_links.inc | 1 |
2 files changed, 5 insertions, 16 deletions
diff --git a/doc/source/dev/gitwash/development_setup.rst b/doc/source/dev/gitwash/development_setup.rst index 53fbf6b76..4c64b1db9 100644 --- a/doc/source/dev/gitwash/development_setup.rst +++ b/doc/source/dev/gitwash/development_setup.rst @@ -62,7 +62,7 @@ Overview git clone https://github.com/your-user-name/numpy.git cd numpy - git remote add upstream git://github.com/numpy/numpy.git + git remote add upstream https://github.com/numpy/numpy.git In detail ========= @@ -95,26 +95,16 @@ Linking your repository to the upstream repo :: cd numpy - git remote add upstream git://github.com/numpy/numpy.git + git remote add upstream https://github.com/numpy/numpy.git ``upstream`` here is just the arbitrary name we're using to refer to the main NumPy_ repository at `NumPy github`_. -Note that we've used ``git://`` for the URL rather than ``https://``. The -``git://`` URL is read only. This means we that we can't accidentally -(or deliberately) write to the upstream repo, and we are only going to -use it to merge into our own code. - -But git protocol is commonly blocked by big corporate firewalls. -To prevent this, you can use SSH or HTTPS. -To change the url, you can use ``git remote set-url upstream new-url``. -For more info, visit `git protocols`_. - Just for your own satisfaction, show yourself that you now have a new 'remote', with ``git remote -v show``, giving you something like:: - upstream git://github.com/numpy/numpy.git (fetch) - upstream git://github.com/numpy/numpy.git (push) + upstream https://github.com/numpy/numpy.git (fetch) + upstream https://github.com/numpy/numpy.git (push) origin https://github.com/your-user-name/numpy.git (fetch) origin https://github.com/your-user-name/numpy.git (push) @@ -143,7 +133,7 @@ Your config file should now look something like (from url = https://github.com/your-user-name/numpy.git fetch = +refs/heads/*:refs/remotes/origin/* [remote "upstream"] - url = git://github.com/numpy/numpy.git + url = https://github.com/numpy/numpy.git fetch = +refs/heads/*:refs/remotes/upstream/* fetch = +refs/pull/*/head:refs/remotes/upstream/pr/* [branch "master"] diff --git a/doc/source/dev/gitwash/git_links.inc b/doc/source/dev/gitwash/git_links.inc index 7c3b3e76b..30532da99 100644 --- a/doc/source/dev/gitwash/git_links.inc +++ b/doc/source/dev/gitwash/git_links.inc @@ -56,7 +56,6 @@ .. _learn git: https://www.atlassian.com/git/tutorials/ .. _filing pull requests: https://help.github.com/articles/using-pull-requests/#initiating-the-pull-request .. _pull request review: https://help.github.com/articles/using-pull-requests/#reviewing-the-pull-request -.. _`git protocols`: https://git-scm.com/book/id/v2/Git-on-the-Server-The-Protocols .. other stuff |