summaryrefslogtreecommitdiff
path: root/doc/source/dev/development_workflow.rst
diff options
context:
space:
mode:
authorBen Nathanson <github@bigriver.xyz>2020-06-01 05:13:57 -0400
committerBen Nathanson <github@bigriver.xyz>2020-06-01 05:13:57 -0400
commitafc343096773c15bb0aa74f910d6705e52d9eba4 (patch)
treef8275c5ab255367a8a43e218248b68cdc467cd39 /doc/source/dev/development_workflow.rst
parentf9e161df7113350b6a0f83d975dbbb5c2fe93ee7 (diff)
downloadnumpy-afc343096773c15bb0aa74f910d6705e52d9eba4.tar.gz
DOC: Fix development_workflow links
Fixed links for branch delete and graph visualizer. Updated instructions for branch delete (git since 1.7.0 (Sept 2010) has allowed --delete sted ':'). 'Learn git' link pointed to Bitbucket instructions; replaced with GitHub instructions. Minor rewording in 'Pushing changes to the main repo'. This is NOT a review of the page, only some fixes.
Diffstat (limited to 'doc/source/dev/development_workflow.rst')
-rw-r--r--doc/source/dev/development_workflow.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/source/dev/development_workflow.rst b/doc/source/dev/development_workflow.rst
index 2ad764a78..d5a49a9f9 100644
--- a/doc/source/dev/development_workflow.rst
+++ b/doc/source/dev/development_workflow.rst
@@ -377,10 +377,10 @@ Deleting a branch on github_
# delete branch locally
git branch -D my-unwanted-branch
# delete branch on github
- git push origin :my-unwanted-branch
+ git push origin --delete my-unwanted-branch
-(Note the colon ``:`` before ``test-branch``. See also:
-https://github.com/guides/remove-a-remote-branch
+See also:
+https://stackoverflow.com/questions/2003505/how-do-i-delete-a-git-branch-locally-and-remotely
Several people sharing a single repository
@@ -477,7 +477,7 @@ backport.
Pushing changes to the main repo
================================
-*This is only relevant if you have commit rights to the main NumPy repo.*
+*Requires commit rights to the main NumPy repo.*
When you have a set of "ready" changes in a feature branch ready for
NumPy's ``master`` or ``maintenance`` branches, you can push