tsai-jimmy · May 20, 2018 15:06 · Feb 14, 2017 · Feb 14, 2017 · Feb 14, 2017 · Feb 14, 2017
diff --git a/setup-gh-cli-auth-2fa.md b/setup-gh-cli-auth-2fa.md
@@ -48,4 +48,4 @@ These are instructions for setting up git to authenticate with GitHub when you h
     
     You should NOT be asked for your username and password, instead you should see `Everything up-to-date`.
 
-    Rejoice and close the shell.
+    Rejoice and close the shell.  If your test repository isn't important, you can delete it from the bcgov GitHub account.
diff --git a/setup-gh-cli-auth-2fa.md b/setup-gh-cli-auth-2fa.md
@@ -23,9 +23,9 @@ These are instructions for setting up git to authenticate with GitHub when you h
 
 4. [Set up a personal access token](https://help.github.com/articles/creating-an-access-token-for-command-line-use) for accessing GitHub repositories - I recommend giving it `gist`, `repo`, and `user` scope. *Make sure you copy the token now as you won't be able to later*
 
-5. Create test repository in the bcgov org.
+5. Create a test repository in the [bcgov organization](https://github.com/bcgov).
 
-6. Clone the repository on the command line:
+6. Clone the repository on the command line (terminal/git bash window):
     ```
     git clone https://github.com/bcgov/[my-test-repo]
     ```
@@ -39,7 +39,7 @@ These are instructions for setting up git to authenticate with GitHub when you h
     git push -u origin master
     ```
 
-    At this point you'll be asked for your username and password. Enter your username, then in the password prompt *paste your Personal Access Token you created in step 3*. (Note: in the windows git bash shell, paste with Shift+Insert or right-click -> paste)
+    At this point you'll be asked for your username and password. Enter your username, then in the password prompt *paste your Personal Access Token you created in step 3*. (Note: in the Windows git bash shell, paste with Shift+Insert or right-click -> paste)
 
 9. Now push AGAIN.
     ```

diff --git a/setup-gh-cli-auth-2fa.md b/setup-gh-cli-auth-2fa.md
@@ -1,8 +1,8 @@
 These are instructions for setting up git to authenticate with GitHub when you have 2-factor authentication set up. This authentication should be inherited by any GUI client you are using. These are intentionally brief instructions, with links to more detail in the appropriate places.
 
-1. Download and install the [git command-line client](https://git-scm.com/download)
+1. Download and install the [git command-line client](https://git-scm.com/download) (if required).
 
-2. Open the git bash window and [Introduce yourself to git](http://happygitwithr.com/hello-git.html):
+2. Open the git bash window and [introduce yourself to git](http://happygitwithr.com/hello-git.html) (if required):
 
     ```
     git config --global user.name 'Firstname Lastname'

diff --git a/setup-gh-cli-auth-2fa.md b/setup-gh-cli-auth-2fa.md
@@ -1,4 +1,4 @@
-These are instructions for setting up git to authenticate with GitHub when you have 2-factor authentication set up. This authentication should be inherited by any GUI client you are using.
+These are instructions for setting up git to authenticate with GitHub when you have 2-factor authentication set up. This authentication should be inherited by any GUI client you are using. These are intentionally brief instructions, with links to more detail in the appropriate places.
 
 1. Download and install the [git command-line client](https://git-scm.com/download)
 
@@ -11,12 +11,12 @@ These are instructions for setting up git to authenticate with GitHub when you h
 
 3. Turn on the credential helper to cache your credentials (so you only need to do this once):
 
-    a. Windows ([more detailed instructions here](https://help.github.com/articles/caching-your-github-password-in-git/#platform-windows):
+    a. Windows ([more detailed instructions here](https://help.github.com/articles/caching-your-github-password-in-git/#platform-windows)):
     ```
     git config --global credential.helper wincred
     ```
     
-    b. Mac ([more detailed instructions here](https://help.github.com/articles/caching-your-github-password-in-git/#platform-mac): 
+    b. Mac ([more detailed instructions here](https://help.github.com/articles/caching-your-github-password-in-git/#platform-mac)): 
     ```
     git config --global credential.helper osxkeychain
     ```

diff --git a/setup-gh-cli-auth-2fa.md b/setup-gh-cli-auth-2fa.md
@@ -10,6 +10,7 @@ These are instructions for setting up git to authenticate with GitHub when you h
     ```
 
 3. Turn on the credential helper to cache your credentials (so you only need to do this once):
+
     a. Windows ([more detailed instructions here](https://help.github.com/articles/caching-your-github-password-in-git/#platform-windows):
     ```
     git config --global credential.helper wincred

diff --git a/setup-gh-cli-auth-2fa-win.md → setup-gh-cli-auth-2fa.md b/setup-gh-cli-auth-2fa-win.md → setup-gh-cli-auth-2fa.md
diff --git a/setup-gh-cli-auth-2fa-win.md b/setup-gh-cli-auth-2fa-win.md
@@ -1,6 +1,6 @@
-These are instructions for setting up git on your Windows machine to authenticate with GitHub when you have 2-factor authentication set up. This authentication should be inherited by any GUI client you are using.
+These are instructions for setting up git to authenticate with GitHub when you have 2-factor authentication set up. This authentication should be inherited by any GUI client you are using.
 
-1. Download and install the [git command-line client](https://git-scm.com/download/win)
+1. Download and install the [git command-line client](https://git-scm.com/download)
 
 2. Open the git bash window and [Introduce yourself to git](http://happygitwithr.com/hello-git.html):
 
@@ -10,9 +10,15 @@ These are instructions for setting up git on your Windows machine to authenticat
     ```
 
 3. Turn on the credential helper to cache your credentials (so you only need to do this once):
+    a. Windows ([more detailed instructions here](https://help.github.com/articles/caching-your-github-password-in-git/#platform-windows):
     ```
     git config --global credential.helper wincred
     ```
+    
+    b. Mac ([more detailed instructions here](https://help.github.com/articles/caching-your-github-password-in-git/#platform-mac): 
+    ```
+    git config --global credential.helper osxkeychain
+    ```
 
 4. [Set up a personal access token](https://help.github.com/articles/creating-an-access-token-for-command-line-use) for accessing GitHub repositories - I recommend giving it `gist`, `repo`, and `user` scope. *Make sure you copy the token now as you won't be able to later*
 

diff --git a/setup-gh-cli-auth-2fa-win.md b/setup-gh-cli-auth-2fa-win.md
@@ -14,7 +14,7 @@ These are instructions for setting up git on your Windows machine to authenticat
     git config --global credential.helper wincred
     ```
 
-4. Set up a [personal access token](https://help.github.com/articles/creating-an-access-token-for-command-line-use) for accessing GitHub repositories - I recommend giving it `gist`, `repo`, and `user` scope. *Make sure you copy the token now as you won't be able to later*
+4. [Set up a personal access token](https://help.github.com/articles/creating-an-access-token-for-command-line-use) for accessing GitHub repositories - I recommend giving it `gist`, `repo`, and `user` scope. *Make sure you copy the token now as you won't be able to later*
 
 5. Create test repository in the bcgov org.
 

diff --git a/setup-gh-cli-auth-2fa-win.md b/setup-gh-cli-auth-2fa-win.md
@@ -14,7 +14,7 @@ These are instructions for setting up git on your Windows machine to authenticat
     git config --global credential.helper wincred
     ```
 
-4. Set up a [personal access token for github](https://help.github.com/articles/creating-an-access-token-for-command-line-use) - I recommend giving it `gist`, `repo`, and `user` scope. *Make sure you copy the token now as you won't be able to later*
+4. Set up a [personal access token](https://help.github.com/articles/creating-an-access-token-for-command-line-use) for accessing GitHub repositories - I recommend giving it `gist`, `repo`, and `user` scope. *Make sure you copy the token now as you won't be able to later*
 
 5. Create test repository in the bcgov org.
 

diff --git a/setup-gh-cli-auth-2fa-win.md b/setup-gh-cli-auth-2fa-win.md
@@ -2,7 +2,7 @@ These are instructions for setting up git on your Windows machine to authenticat
 
 1. Download and install the [git command-line client](https://git-scm.com/download/win)
 
-2. [Introduce yourself to git](http://happygitwithr.com/hello-git.html):
+2. Open the git bash window and [Introduce yourself to git](http://happygitwithr.com/hello-git.html):
 
     ```
     git config --global user.name 'Firstname Lastname'

diff --git a/setup-gh-cli-auth-2fa-win.md b/setup-gh-cli-auth-2fa-win.md
@@ -9,7 +9,7 @@ These are instructions for setting up git on your Windows machine to authenticat
     git config --global user.email '[email protected]'
     ```
 
-3. Turn on the credential helper to cache your credentials:
+3. Turn on the credential helper to cache your credentials (so you only need to do this once):
     ```
     git config --global credential.helper wincred
     ```

diff --git a/setup-gh-cli-auth-2fa-win.md b/setup-gh-cli-auth-2fa-win.md
@@ -1,4 +1,4 @@
-These are instructions for setting up git on your Windows machine to authenticate with GitHub when you have 2-factor authentication set up.
+These are instructions for setting up git on your Windows machine to authenticate with GitHub when you have 2-factor authentication set up. This authentication should be inherited by any GUI client you are using.
 
 1. Download and install the [git command-line client](https://git-scm.com/download/win)
 

diff --git a/setup-gh-cli-auth-2fa-win.md b/setup-gh-cli-auth-2fa-win.md
@@ -1,3 +1,5 @@
+These are instructions for setting up git on your Windows machine to authenticate with GitHub when you have 2-factor authentication set up.
+
 1. Download and install the [git command-line client](https://git-scm.com/download/win)
 
 2. [Introduce yourself to git](http://happygitwithr.com/hello-git.html):
@@ -12,7 +14,7 @@
     git config --global credential.helper wincred
     ```
 
-4. Set up a [personal access token for github](https://help.github.com/articles/creating-an-access-token-for-command-line-use) - I recommend giving it gist, repo, and user scope. *Make sure you copy the token now as you won't be able to later*
+4. Set up a [personal access token for github](https://help.github.com/articles/creating-an-access-token-for-command-line-use) - I recommend giving it `gist`, `repo`, and `user` scope. *Make sure you copy the token now as you won't be able to later*
 
 5. Create test repository in the bcgov org.
 

diff --git a/setup-gh-sli-auth-2fa.md → setup-gh-cli-auth-2fa-win.md b/setup-gh-sli-auth-2fa.md → setup-gh-cli-auth-2fa-win.md
diff --git a/setup-gh-sli-auth-2fa.md b/setup-gh-sli-auth-2fa.md
@@ -1,6 +1,11 @@
 1. Download and install the [git command-line client](https://git-scm.com/download/win)
 
-2. [Introduce yourself to git](http://happygitwithr.com/hello-git.html)
+2. [Introduce yourself to git](http://happygitwithr.com/hello-git.html):
+
+    ```
+    git config --global user.name 'Firstname Lastname'
+    git config --global user.email '[email protected]'
+    ```
 
 3. Turn on the credential helper to cache your credentials:
     ```
@@ -16,7 +21,7 @@
     git clone https://github.com/bcgov/[my-test-repo]
     ```
 
-7. Make any change you want in your local repository. Eg., make or edit a README.md file
+7. Make any change you want in your local repository. Eg., make or edit your `README.md` file.
 
 8. Add, commit, and push your changes:
     ```

diff --git a/setup-gh-sli-auth-2fa.md b/setup-gh-sli-auth-2fa.md
@@ -3,9 +3,9 @@
 2. [Introduce yourself to git](http://happygitwithr.com/hello-git.html)
 
 3. Turn on the credential helper to cache your credentials:
-```
-git config --global credential.helper wincred
-```
+    ```
+    git config --global credential.helper wincred
+    ```
 
 4. Set up a [personal access token for github](https://help.github.com/articles/creating-an-access-token-for-command-line-use) - I recommend giving it gist, repo, and user scope. *Make sure you copy the token now as you won't be able to later*
 
@@ -28,9 +28,10 @@ git config --global credential.helper wincred
     At this point you'll be asked for your username and password. Enter your username, then in the password prompt *paste your Personal Access Token you created in step 3*. (Note: in the windows git bash shell, paste with Shift+Insert or right-click -> paste)
 
 9. Now push AGAIN.
-```
-git push
-```
-You should NOT be asked for your username and password, instead you should see `Everything up-to-date`.
+    ```
+    git push
+    ```
+    
+    You should NOT be asked for your username and password, instead you should see `Everything up-to-date`.
 
-Rejoice and close the shell.
+    Rejoice and close the shell.
diff --git a/setup-gh-sli-auth-2fa.md b/setup-gh-sli-auth-2fa.md
@@ -0,0 +1,36 @@
+1. Download and install the [git command-line client](https://git-scm.com/download/win)
+
+2. [Introduce yourself to git](http://happygitwithr.com/hello-git.html)
+
+3. Turn on the credential helper to cache your credentials:
+```
+git config --global credential.helper wincred
+```
+
+4. Set up a [personal access token for github](https://help.github.com/articles/creating-an-access-token-for-command-line-use) - I recommend giving it gist, repo, and user scope. *Make sure you copy the token now as you won't be able to later*
+
+5. Create test repository in the bcgov org.
+
+6. Clone the repository on the command line:
+    ```
+    git clone https://github.com/bcgov/[my-test-repo]
+    ```
+
+7. Make any change you want in your local repository. Eg., make or edit a README.md file
+
+8. Add, commit, and push your changes:
+    ```
+    git add README.md
+    git commit -m "Edit README"
+    git push -u origin master
+    ```
+
+    At this point you'll be asked for your username and password. Enter your username, then in the password prompt *paste your Personal Access Token you created in step 3*. (Note: in the windows git bash shell, paste with Shift+Insert or right-click -> paste)
+
+9. Now push AGAIN.
+```
+git push
+```
+You should NOT be asked for your username and password, instead you should see `Everything up-to-date`.
+
+Rejoice and close the shell.
No results found