<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.1" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
<h2>NAME</h2>\r
<div class="sectionbody">\r
<p>git-reset -\r
- Reset current HEAD to the specified state.\r
+ Reset current HEAD to the specified state\r
</p>\r
</div>\r
</div>\r
Interrupted workflow\r
</dt>\r
<dd>\r
-<p>You can get interrupted by an ungent fix request while you are\r
-still in the middle of a large change. The files in your\r
+<p>Suppose you are interrupted by an urgent fix request while you\r
+are in the middle of a large change. The files in your\r
working tree are not in any shape to be committed yet, but you\r
need to get to the other branch for a quick bugfix.</p>\r
<div class="listingblock">\r
$ git reset <b>(3)</b>\r
\r
<b>(1)</b> This commit will get blown away so a throw-away log message is OK.\r
-<b>(2)</b> This removes the 'WIP' commit from the commit history, and makes\r
- your working tree in the state just before you made that snapshot.\r
+<b>(2)</b> This removes the 'WIP' commit from the commit history, and sets\r
+ your working tree to the state just before you made that snapshot.\r
<b>(3)</b> After <b>(2)</b>, the index file still has all the WIP changes you\r
committed in <b>(1)</b>. This sets it to the last commit you were\r
basing the WIP changes on.</tt></pre>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 13-Jan-2006 19:58:30 PDT\r
+Last updated 10-Mar-2006 00:31:34 UTC\r
</div>\r
</div>\r
</body>\r