summaryrefslogtreecommitdiffstats
path: root/git-reset.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-01-21 23:50:33 -0800
committerJunio C Hamano <junio@hera.kernel.org>2006-01-21 23:50:33 -0800
commita6331a8706970d61f59625118c262f0e97178d4f (patch)
treec847b6e8ae7686a1c6cd7517c78ee0cbe1042d76 /git-reset.html
parente1de1f67f401939a4ae76c14449db7f12c97e494 (diff)
downloadgit-htmldocs-a6331a8706970d61f59625118c262f0e97178d4f.tar.gz
Autogenerated HTML docs for v1.1.4-g5b2b
Diffstat (limited to 'git-reset.html')
-rw-r--r--git-reset.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-reset.html b/git-reset.html
index 83ee3679e..915201d16 100644
--- a/git-reset.html
+++ b/git-reset.html
@@ -448,8 +448,8 @@ and resets the tip of the branch to that commit.</tt></pre>
Interrupted workflow
</dt>
<dd>
-<p>You can get interrupted by an ungent fix request while you are
-still in the middle of a large change. The files in your
+<p>Suppose you are interrupted by an urgent fix request while you
+are in the middle of a large change. The files in your
working tree are not in any shape to be committed yet, but you
need to get to the other branch for a quick bugfix.</p>
<div class="listingblock">
@@ -465,8 +465,8 @@ $ git reset --soft HEAD^ ;# go back to WIP state <b>(2)</b>
$ git reset <b>(3)</b>
<b>(1)</b> This commit will get blown away so a throw-away log message is OK.
-<b>(2)</b> This removes the 'WIP' commit from the commit history, and makes
- your working tree in the state just before you made that snapshot.
+<b>(2)</b> This removes the 'WIP' commit from the commit history, and sets
+ your working tree to the state just before you made that snapshot.
<b>(3)</b> After <b>(2)</b>, the index file still has all the WIP changes you
committed in <b>(1)</b>. This sets it to the last commit you were
basing the WIP changes on.</tt></pre>
@@ -488,7 +488,7 @@ $ git reset <b>(3)</b>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 13-Jan-2006 19:58:30 PDT
+Last updated 21-Jan-2006 23:50:19 PDT
</div>
</div>
</body>