update output of several commands to newer versions

Author: schacon

book/02-git-basics/1-git-basics.asc

@@ -874,7 +874,7 @@ In <<limit_options>> we’ll list these and a few other common options for your
 | `--author`            | Only show commits in which the author entry matches the specified string.
 | `--committer`         | Only show commits in which the committer entry matches the specified string.
 | `--grep`              | Only show commits with a commit message containing the string
-| `-S `                 | Only show commits adding or removing code matching the string
+| `-S`                  | Only show commits adding or removing code matching the string
 |================================
 
 For example, if you want to see which commits modifying test files in the Git source code history were committed by Junio Hamano and were not merges in the month of October 2008, you can run something like this:
@@ -971,6 +971,13 @@ Changes not staged for commit:
 The command is a bit strange, but it works.
 The `benchmarks.rb` file is modified but once again unstaged.
 
+[NOTE]
+=====
+While `git reset` _can_ be a dangerous command if you call it with `--hard`, in this instance the file in your working directory is not touched. Calling `git reset` without an option is not dangerous - it only touches your staging area.
+=====
+
+For now this magic invocation is all you need to know about the `git reset` command. We'll go into much more detail about what `reset` does and how to master it to do really interesting things in <<_git_tools_reset>>.
+
 ==== Unmodifying a Modified File
 
 What if you realize that you don’t want to keep your changes to the `benchmarks.rb` file?
@@ -1003,26 +1010,27 @@ Changes to be committed:
 ----
 
 You can see that the changes have been reverted.
-You should also realize that this is a dangerous command: any changes you made to that file are gone – you just copied another file over it.
+
+[IMPORTANT]
+=====
+It's important to understand that `git checkout -- [file]` is a dangerous command. Any changes you made to that file are gone – you just copied another file over it.
 Don’t ever use this command unless you absolutely know that you don’t want the file.
-If you just need to get it out of the way, we’ll go over stashing and branching in the next chapter; these are generally better ways to go.
+=====
+
+If you would like to keep the changes you've made to that file but still need to get it out of the way for now, we’ll go over stashing and branching in the next chapter; these are generally better ways to go.
 
-Remember, anything that is committed in Git can almost always be recovered.
+Remember, anything that is __committed__ in Git can almost always be recovered.
 Even commits that were on branches that were deleted or commits that were overwritten with an `--amend` commit can be recovered (see <<data_recovery>> for data recovery).
 However, anything you lose that was never committed is likely never to be seen again.
 
-==== Undoing All Changes
-
-**TODO**
-
 === Working with Remotes
 
 To be able to collaborate on any Git project, you need to know how to manage your remote repositories.
 Remote repositories are versions of your project that are hosted on the Internet or network somewhere.
 You can have several of them, each of which generally is either read-only or read/write for you.
 Collaborating with others involves managing these remote repositories and pushing and pulling data to and from them when you need to share work.
 Managing remote repositories includes knowing how to add remote repositories, remove remotes that are no longer valid, manage various remote branches and define them as being tracked or not, and more.
-In this section, we’ll cover these remote-management skills.
+In this section, we’ll cover some of these remote-management skills.
 
 ==== Showing Your Remotes
 
@@ -1044,29 +1052,36 @@ $ git remote
 origin
 ----
 
-You can also specify `-v`, which shows you the URL that Git has stored for the shortname to be expanded to:
+You can also specify `-v`, which shows you the URLs that Git has stored for the shortname to be used when reading and writing to that remote:
 
 [source,shell]
 ----
 $ git remote -v
-origin  https://github.com/schacon/ticgit.git
+origin	https://github.com/schacon/ticgit (fetch)
+origin	https://github.com/schacon/ticgit (push)
 ----
 
 If you have more than one remote, the command lists them all.
-For example, my Grit repository looks something like this.
+For example, a repository with multiple remotes for working with several collaborators might look something like this.
 
 [source,shell]
 ----
 $ cd grit
 $ git remote -v
-bakkdoor  https://github.com/bakkdoor/grit.git
-cho45     https://github.com/cho45/grit.git
-defunkt   https://github.com/defunkt/grit.git
-koke      git://github.com/koke/grit.git
-origin    [email protected]:mojombo/grit.git
+bakkdoor  https://github.com/bakkdoor/grit (fetch)
+bakkdoor  https://github.com/bakkdoor/grit (push)
+cho45     https://github.com/cho45/grit (fetch)
+cho45     https://github.com/cho45/grit (push)
+defunkt   https://github.com/defunkt/grit (fetch)
+defunkt   https://github.com/defunkt/grit (push)
+koke      git://github.com/koke/grit.git (fetch)
+koke      git://github.com/koke/grit.git (push)
+origin    [email protected]:mojombo/grit.git (fetch)
+origin    [email protected]:mojombo/grit.git (push)
 ----
 
-This means we can pull contributions from any of these users pretty easily.
+This means we can pull contributions from any of these users pretty easily. We may additionally have permission to push to one or more of these, though we can't tell that here.
+
 Notice that these remotes use a variety of protocols; we’ll cover why more about this in <<_git_on_the_server>>.
 
 ==== Adding Remote Repositories
@@ -1078,12 +1093,12 @@ To add a new remote Git repository as a shortname you can reference easily, run
 ----
 $ git remote
 origin
-$ git remote add pb https://github.com/paulboone/ticgit.git
+$ git remote add pb https://github.com/paulboone/ticgit
 $ git remote -v
-origin	https://github.com/schacon/ticgit.git (fetch)
-origin	https://github.com/schacon/ticgit.git (push)
-pb	https://github.com/paulboone/ticgit.git (fetch)
-pb	https://github.com/paulboone/ticgit.git (push)
+origin	https://github.com/schacon/ticgit (fetch)
+origin	https://github.com/schacon/ticgit (push)
+pb	https://github.com/paulboone/ticgit (fetch)
+pb	https://github.com/paulboone/ticgit (push)
 ----
 
 Now you can use the string `pb` on the command line in lieu of the whole URL.
@@ -1100,7 +1115,10 @@ From https://github.com/paulboone/ticgit
  * [new branch]      master     -> pb/master
  * [new branch]      ticgit     -> pb/ticgit
 ----
-Paul’s master branch is accessible locally as `pb/master` – you can merge it into one of your branches, or you can check out a local branch at that point if you want to inspect it.
+
+Paul’s master branch is now accessible locally as `pb/master` – you can merge it into one of your branches, or you can check out a local branch at that point if you want to inspect it.
+(We’ll go over what branches are and how to use them in much more detail in <<_git_branching>>.)
+
 
 ==== Fetching and Pulling from Your Remotes
 
@@ -1113,11 +1131,10 @@ $ git fetch [remote-name]
 
 The command goes out to that remote project and pulls down all the data from that remote project that you don’t have yet.
 After you do this, you should have references to all the branches from that remote, which you can merge in or inspect at any time.
-(We’ll go over what branches are and how to use them in much more detail in <<_git_branching>>.)
 
 If you clone a repository, the command automatically adds that remote repository under the name origin.
 So, `git fetch origin` fetches any new work that has been pushed to that server since you cloned (or last fetched from) it.
-It’s important to note that the fetch command pulls the data to your local repository – it doesn’t automatically merge it with any of your work or modify what you’re currently working on.
+It’s important to note that the `git fetch` command pulls the data to your local repository – it doesn’t automatically merge it with any of your work or modify what you’re currently working on.
 You have to merge it manually into your work when you’re ready.
 
 If you have a branch set up to track a remote branch (see the next section and <<_git_branching>> for more information), you can use the `git pull` command to automatically fetch and then merge a remote branch into your current branch.
@@ -1128,7 +1145,7 @@ Running `git pull` generally fetches data from the server you originally cloned
 
 When you have your project at a point that you want to share, you have to push it upstream.
 The command for this is simple: `git push [remote-name] [branch-name]`.
-If you want to push your master branch to your `origin` server (again, cloning generally sets up both of those names for you automatically), then you can run this to push your work back up to the server:
+If you want to push your master branch to your `origin` server (again, cloning generally sets up both of those names for you automatically), then you can run this to push any commits you've done back up to the server:
 
 [source,shell]
 ----
@@ -1149,12 +1166,12 @@ If you run this command with a particular shortname, such as `origin`, you get s
 ----
 $ git remote show origin
 * remote origin
-  Fetch URL: https://github.com/schacon/ticgit.git
-  Push  URL: https://github.com/schacon/ticgit.git
+  Fetch URL: https://github.com/schacon/ticgit
+  Push  URL: https://github.com/schacon/ticgit
   HEAD branch: master
   Remote branches:
-    master tracked
-    ticgit tracked
+    master                               tracked
+    dev-branch                           tracked
   Local branch configured for 'git pull':
     master merges with remote master
   Local ref configured for 'git push':
@@ -1172,33 +1189,32 @@ When you’re using Git more heavily, however, you may see much more information
 ----
 $ git remote show origin
 * remote origin
-  URL: [email protected]:defunkt/github.git
-  Remote branch merged with 'git pull' while on branch issues
-    issues
-  Remote branch merged with 'git pull' while on branch master
-    master
-  New remote branches (next fetch will store in remotes/origin)
-    caching
-  Stale tracking branches (use 'git remote prune')
-    libwalker
-    walker2
-  Tracked remote branches
-    acl
-    apiv2
-    dashboard2
-    issues
-    master
-    postgres
-  Local branch pushed with 'git push'
-    master:master
-----
-
-This command shows which branch is automatically pushed when you run `git push` on certain branches.
+  URL: https://github.com/my-org/complex-project
+  Fetch URL: https://github.com/my-org/complex-project
+  Push  URL: https://github.com/my-org/complex-project
+  HEAD branch: master
+  Remote branches:
+    master                           tracked
+    dev-branch                       tracked
+    markdown-strip                   tracked
+    issue-43                         new (next fetch will store in remotes/origin)
+    issue-45                         new (next fetch will store in remotes/origin)
+    refs/remotes/origin/issue-11     stale (use 'git remote prune' to remove)
+  Local branches configured for 'git pull':
+    dev-branch merges with remote dev-branch
+    master     merges with remote master
+  Local refs configured for 'git push':
+    dev-branch                     pushes to dev-branch                          (up to date)
+    markdown-strip                 pushes to markdown-strip                 (up to date)
+    master                         pushes to master                         (up to date)
+----
+
+This command shows which branch is automatically pushed to when you run `git push` while on certain branches.
 It also shows you which remote branches on the server you don’t yet have, which remote branches you have that have been removed from the server, and multiple branches that are automatically merged when you run `git pull`.
 
 ==== Removing and Renaming Remotes
 
-If you want to rename a reference, in newer versions of Git you can run `git remote rename` to change a remote’s shortname.
+If you want to rename a reference you can run `git remote rename` to change a remote’s shortname.
 For instance, if you want to rename `pb` to `paul`, you can do so with `git remote rename`:
 
 [source,shell]