Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DOCS: Removed broken git links. #5569

Merged
merged 2 commits into from
Nov 8, 2023
Merged

DOCS: Removed broken git links. #5569

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24accc8
removed broken git links.
tkknight Nov 8, 2023
7278120
added whatsnew
tkknight Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion docs/src/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@ def _dotv(version):
"https://docs.github.com",
"https://github.com",
"http://www.personal.psu.edu/cab38/ColorBrewer/ColorBrewer_updates.html",
"http://schacon.github.com/git",
"http://scitools.github.com/cartopy",
"http://www.wmo.int/pages/prog/www/DPFS/documents/485_Vol_I_en_colour.pdf",
"https://software.ac.uk/how-cite-software",
Expand Down
11 changes: 5 additions & 6 deletions docs/src/developers_guide/gitwash/development_workflow.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ what the changes in the branch are for. For example ``add-ability-to-fly``, or
git checkout my-new-feature

Generally, you will want to keep your feature branches on your public github_
fork of `iris`_. To do this, you `git push`_ this new branch up to your
fork of `iris`_. To do this, you ``git push`` this new branch up to your
github repo. Generally (if you followed the instructions in these pages, and by
default), git will have a link to your github repo, called ``origin``. You push
up to your own repo on github with::
Expand Down Expand Up @@ -108,7 +108,7 @@ In More Detail
--------------

#. Make some changes
#. See which files have changed with ``git status`` (see `git status`_).
#. See which files have changed with ``git status``.
You'll see a listing like this one::

# On branch ny-new-feature
Expand All @@ -124,16 +124,15 @@ In More Detail
# INSTALL
no changes added to commit (use "git add" and/or "git commit -a")

#. Check what the actual changes are with ``git diff`` (`git diff`_).
#. Add any new files to version control ``git add new_file_name`` (see
`git add`_).
#. Check what the actual changes are with ``git diff``.
#. Add any new files to version control ``git add new_file_name``.
#. To commit all modified files into the local copy of your repo, do
``git commit -am 'A commit message'``. Note the ``-am`` options to
``commit``. The ``m`` flag just signals that you're going to type a
message on the command line. The ``a`` flag will automatically stage
all files that have been modified and deleted.
#. To push the changes up to your forked repo on github, do a ``git
push`` (see `git push`_).
push``.


Testing Your Changes
Expand Down
14 changes: 0 additions & 14 deletions docs/src/developers_guide/gitwash/git_links.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,6 @@
.. _github help: https://help.github.com
.. _git documentation: https://git-scm.com/docs

.. _git clone: http://schacon.github.com/git/git-clone.html
.. _git checkout: http://schacon.github.com/git/git-checkout.html
.. _git commit: http://schacon.github.com/git/git-commit.html
.. _git push: http://schacon.github.com/git/git-push.html
.. _git pull: http://schacon.github.com/git/git-pull.html
.. _git add: http://schacon.github.com/git/git-add.html
.. _git status: http://schacon.github.com/git/git-status.html
.. _git diff: http://schacon.github.com/git/git-diff.html
.. _git log: http://schacon.github.com/git/git-log.html
.. _git branch: http://schacon.github.com/git/git-branch.html
.. _git remote: http://schacon.github.com/git/git-remote.html
.. _git rebase: http://schacon.github.com/git/git-rebase.html
.. _git config: http://schacon.github.com/git/git-config.html

.. _linux git workflow: http://www.mail-archive.com/[email protected]/msg39091.html

.. |emdash| unicode:: U+02014
Loading