X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-reset.html;h=7d3cc7edddcb93397b423060158b15872b4cf9c0;hb=adeb8991849ffe32f3f7b2ca018c498db75e51f2;hp=7cacfd29939e8b0238349380a695270ee6081a87;hpb=1a4e841b439ba014b365999c3a6b9e2be3740bd8;p=git.git

diff --git a/git-reset.html b/git-reset.html
index 7cacfd29..7d3cc7ed 100644
--- a/git-reset.html
+++ b/git-reset.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -266,7 +266,7 @@ git-reset(1) Manual Page
 <h2>NAME</h2>
 <div class="sectionbody">
 <p>git-reset -
-   Reset current HEAD to the specified state.
+   Reset current HEAD to the specified state
 </p>
 </div>
 </div>
@@ -444,6 +444,34 @@ brings your index file and the working tree back to that state,
 and resets the tip of the branch to that commit.</tt></pre>
 </div></div>
 </dd>
+<dt>
+Interrupted workflow
+</dt>
+<dd>
+<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">
+<div class="content">
+<pre><tt>$ git checkout feature ;# you were working in "feature" branch and
+$ work work work       ;# got interrupted
+$ git commit -a -m 'snapshot WIP' <b>(1)</b>
+$ git checkout master
+$ fix fix fix
+$ git commit ;# commit with real log
+$ git checkout feature
+$ 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 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>
+</div></div>
+</dd>
 </dl>
 </div>
 <h2>Author</h2>
@@ -460,7 +488,7 @@ and resets the tip of the branch to that commit.</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Dec-2005 00:16:36 PDT
+Last updated 10-Mar-2006 00:31:34 UTC
 </div>
 </div>
 </body>
