From 2518489e09a10ed64bddd3a56a5a1646b795749e Mon Sep 17 00:00:00 2001
From: Soon Van <cog@randomecho.com>
Date: Tue, 21 May 2013 22:06:56 -0400
Subject: [PATCH 1/2] git reset does not affect commit, but changes index,
 stage to them

Clear up what happens when you run `git reset` in that it does
not affect the commit, or allow to change it per se, but that it
affects what is sitting in the index and staging as pointed to
by the commit or HEAD pointer mentioned.

Fixes #63
---
 basic/index.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/basic/index.html b/basic/index.html
index 9a2f3d3..b760752 100644
--- a/basic/index.html
+++ b/basic/index.html
@@ -612,7 +612,7 @@ <h2>
 
     <h4>
       git reset HEAD
-      <small>undo the last commit and unstage the files</small>
+      <small>unstage files from index and reset pointer to HEAD</small>
     </h4>
 
     <p>First, you can use it to unstage something that has been
@@ -691,7 +691,7 @@ <h4>
 
     <h4>
       git reset --soft
-      <small>undo the last commit</small>
+      <small>moves what HEAD points to, index and staging are untouched</small>
     </h4>
 
     <p>The first thing <code>git reset</code> does is undo the last
@@ -721,11 +721,12 @@ <h4>
 
     <h4>
       git reset --hard
-      <small>undo the last commit, unstage files AND undo any changes in the working directory</small>
+      <small>unstage files AND undo any changes in the working directory since last commit</small>
     </h4>
 
     <p>The third option is to go <code>--hard</code> and make your working
-       directory look like the index, unstage files and undo the last commit.
+       directory look like the index, unstage files and undo any changes made
+       since the last commit.
        This is the most dangerous option and not working directory safe. Any
        changes not in the index or have not been commited will be lost.</p>
 
@@ -752,7 +753,8 @@ <h4>
 
     <p>In the above example, while we had both changes ready to commit and
        ready to stage, a <code>git reset --hard</code> wiped them out.
-       On top of that, the last commit has been undone.</p>
+       The working tree and stage are now reset to the point just after the
+       commit pointed at by HEAD.</p>
 
     <p>You can replace <code>HEAD</code> with a commit SHA-1 or another
     parent reference to reset to that specific point.</p>

From c60a95ab38c636cad12e6640ee596c519766b86b Mon Sep 17 00:00:00 2001
From: Soon Van <cog@randomecho.com>
Date: Wed, 22 May 2013 13:56:20 -0400
Subject: [PATCH 2/2] Clarify where git reset moves HEAD, affect on stage,
 index

---
 basic/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/basic/index.html b/basic/index.html
index b760752..23455c8 100644
--- a/basic/index.html
+++ b/basic/index.html
@@ -691,7 +691,7 @@ <h4>
 
     <h4>
       git reset --soft
-      <small>moves what HEAD points to, index and staging are untouched</small>
+      <small>moves HEAD to specified commit reference, index and staging are untouched</small>
     </h4>
 
     <p>The first thing <code>git reset</code> does is undo the last
@@ -753,8 +753,8 @@ <h4>
 
     <p>In the above example, while we had both changes ready to commit and
        ready to stage, a <code>git reset --hard</code> wiped them out.
-       The working tree and stage are now reset to the point just after the
-       commit pointed at by HEAD.</p>
+       The working tree and staging area are reset to the tip of the current
+       branch or HEAD.</p>
 
     <p>You can replace <code>HEAD</code> with a commit SHA-1 or another
     parent reference to reset to that specific point.</p>