Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/git/git-reference.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Beer <brent.beer@gmail.com>2015-08-18 16:06:24 +0300
committerBrent Beer <brent.beer@gmail.com>2015-08-18 16:06:24 +0300
commit25eab6ec54c2b192985db8d02340116503085a2a (patch)
tree52b800be01188b4ae5d22d5d5207f3a18ccdeabf
parent64707c0f60e5cb1627bd9701cdb51b7c9f53b972 (diff)
parent1043ad7ca78b77fe61346bd93b7c2634d1a09543 (diff)
Merge pull request #101 from niels-bom-md/gh-pages
Fixing grammar and typo. Also is more explicit about what reset --hard does
-rw-r--r--basic/index.html13
1 files changed, 7 insertions, 6 deletions
diff --git a/basic/index.html b/basic/index.html
index b381b86..acdb606 100644
--- a/basic/index.html
+++ b/basic/index.html
@@ -724,12 +724,13 @@ nothing to commit (working directory clean)
<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 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>
-
+ <p>The third option is to go <code>--hard</code>. This command discards your staged changes and
+ the changes in your working directory. In other words: it resets your staging area and working
+ directory to the state they were in at the given commit. This is the most
+ dangerous option and is not working directory safe. Any changes not committed will
+ be lost.
+ </p>
+
<pre>
<b>$ git status</b>
# On branch master