diff options
| author | Matthew McCullough <matthew@github.com> | 2014-01-09 20:54:23 +0400 |
|---|---|---|
| committer | Matthew McCullough <matthew@github.com> | 2014-01-09 20:54:23 +0400 |
| commit | e97fc7eeebb7ddde87e994586e0c6ff69200d124 (patch) | |
| tree | 4e1c6a852926497fb1595215fe9d72b44a58e253 | |
| parent | 9cdec2fac586f2b64c0163364246f410c51e94af (diff) | |
| parent | 450a1c1b1890ef519a5dc43980a2b70c2b7dda45 (diff) | |
Merge pull request #73 from adailey14/63-correct-reset-notes
Rebase of pull request 64 onto latest gh-pages
| -rw-r--r-- | basic/index.html | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/basic/index.html b/basic/index.html index 0904da9..6c765b5 100644 --- a/basic/index.html +++ b/basic/index.html @@ -612,7 +612,7 @@ Further paragraphs come after blank lines. <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 @@ M hello.rb <h4> git reset --soft - <small>undo the last commit</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 @@ -721,11 +721,12 @@ nothing to commit (working directory clean) <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 @@ nothing to commit (working directory clean) <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 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> |