diff options
Diffstat (limited to 'doc/source/dev/gitwash')
| -rw-r--r-- | doc/source/dev/gitwash/development_setup.rst | 5 | ||||
| -rw-r--r-- | doc/source/dev/gitwash/git_links.inc | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/source/dev/gitwash/development_setup.rst b/doc/source/dev/gitwash/development_setup.rst index 5623364a2..53fbf6b76 100644 --- a/doc/source/dev/gitwash/development_setup.rst +++ b/doc/source/dev/gitwash/development_setup.rst @@ -105,6 +105,11 @@ Note that we've used ``git://`` for the URL rather than ``https://``. The (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:: diff --git a/doc/source/dev/gitwash/git_links.inc b/doc/source/dev/gitwash/git_links.inc index 30532da99..7c3b3e76b 100644 --- a/doc/source/dev/gitwash/git_links.inc +++ b/doc/source/dev/gitwash/git_links.inc @@ -56,6 +56,7 @@ .. _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 |