From 7ba8ea9cad2cbf798653f9bd583135cfa51ab2ed Mon Sep 17 00:00:00 2001 From: Joshua Warner Date: Thu, 12 May 2016 21:25:05 -0500 Subject: [PATCH 1/3] DOC: Guide new contributors to HTTPS, not SSH --- .github/CONTRIBUTING.txt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/CONTRIBUTING.txt b/.github/CONTRIBUTING.txt index 3d183307..544653c1 100644 --- a/.github/CONTRIBUTING.txt +++ b/.github/CONTRIBUTING.txt @@ -11,17 +11,10 @@ Here's the long and short of it: * Clone the project to your local computer:: - git clone git@github.com:your-username/scikit-image.git + git clone https://github.com/your-username/scikit-image.git * Add the upstream repository: - - If you have set up your `github SSH keys - `_:: - - git remote add upstream git@github.com:scikit-image/scikit-image.git - - - Otherwise:: - git remote add upstream https://github.com/scikit-image/scikit-image.git * Now, you have remote repositories named: @@ -50,6 +43,9 @@ Here's the long and short of it: git push origin transform-speedups + * Enter your GitHub username and password (repeat contributors or advanced + users can remove this step by connecting to GitHub with SSH. See detailed + instructions below if desired). * Go to GitHub. The new branch will show up with a green Pull Request button - click it. From 296c9653f5ec45445bb3b82793959ba5bfee95f4 Mon Sep 17 00:00:00 2001 From: Joshua Warner Date: Thu, 12 May 2016 21:29:06 -0500 Subject: [PATCH 2/3] DOC: Add missing newline. --- .github/CONTRIBUTING.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CONTRIBUTING.txt b/.github/CONTRIBUTING.txt index 544653c1..5fce4257 100644 --- a/.github/CONTRIBUTING.txt +++ b/.github/CONTRIBUTING.txt @@ -46,6 +46,7 @@ Here's the long and short of it: * Enter your GitHub username and password (repeat contributors or advanced users can remove this step by connecting to GitHub with SSH. See detailed instructions below if desired). + * Go to GitHub. The new branch will show up with a green Pull Request button - click it. From 58d84ff6f86324cf3737944aee54b4c0129d5bec Mon Sep 17 00:00:00 2001 From: Joshua Warner Date: Sun, 22 May 2016 23:11:40 -0500 Subject: [PATCH 3/3] DOCFIX: Sphinx formatting tweaks --- .github/CONTRIBUTING.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CONTRIBUTING.txt b/.github/CONTRIBUTING.txt index 5fce4257..0233769d 100644 --- a/.github/CONTRIBUTING.txt +++ b/.github/CONTRIBUTING.txt @@ -13,9 +13,9 @@ Here's the long and short of it: git clone https://github.com/your-username/scikit-image.git - * Add the upstream repository: + * Add the upstream repository:: - git remote add upstream https://github.com/scikit-image/scikit-image.git + git remote add upstream https://github.com/scikit-image/scikit-image.git * Now, you have remote repositories named: