update username bit fixes #8

ohaneje · Jan 21, 2014 · de05b05 · de05b05
1 parent 872150b
commit de05b05
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/help.txt b/help.txt
@@ -7,7 +7,11 @@
 
   {bold}Configure your username{/bold}
 
-  $ git config --global user.name "YourGitHubUserName"
+  $ git config --global user.name "Your Name"
+
+  {bold}Configure your username{/bold}
+
+  $ git config --global user.username githubusername
 
   {bold}Configure your email{/bold}
 

diff --git a/problems/merge_tada/problem.txt b/problems/merge_tada/problem.txt
@@ -2,7 +2,7 @@
 
   --------------------------------------------------------------------
 
-  Your pull request is waiting for review, but meanwhile, since you
+  Your pull request is being mereged! But meanwhile, since you
   know that you definitely want those updates in your forked version, 
   and your branch is in good working order, merge it into the main,
   branch on your forked repository, in this case, `gh-pages`.

diff --git a/problems/merge_tada/verify.js b/problems/merge_tada/verify.js
@@ -4,7 +4,7 @@ var spawn = require('child_process').spawn
 var concat = require('concat-stream')
 
 var ref = spawn('git', ['reflog', '-10'])
-var username = spawn('git', ['config', 'user.name'])
+var username = spawn('git', ['config', 'user.username'])
 
 var user = ""
 

diff --git a/problems/remote_control/problem.txt b/problems/remote_control/problem.txt
@@ -25,11 +25,11 @@
 
   Open a new terminal {bold}(CMD + N){/bold} window and set your name:
 
-  $ git config --global user.name "My Name"
+  $ git config --global user.name "Your Name"
 
   Then add your GitHub username:
 
-  $ git config --global user.username myusername
+  $ git config --global user.username githubusername
 
   Now set your email: