Autogenerated HTML docs for v1.6.3.2-214-gf4f78

1 files changed, 8 insertions, 8 deletions

diff --git a/git-stash.html b/git-stash.html
index 0c37ad5a2..e6a72858a 100644
--- a/git-stash.html
+++ b/git-stash.html
@@ -322,8 +322,8 @@ git-stash(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <div class="content"><em>git stash</em> list [&lt;options&gt;]

-<em>git stash</em> (show | drop | pop ) [&lt;stash&gt;]

-<em>git stash</em> apply [--index] [&lt;stash&gt;]

+<em>git stash</em> ( show | drop ) [&lt;stash&gt;]

+<em>git stash</em> ( pop | apply ) [--index] [&lt;stash&gt;]

 <em>git stash</em> branch &lt;branchname&gt; [&lt;stash&gt;]

 <em>git stash</em> [save [--keep-index] [&lt;message&gt;]]

 <em>git stash</em> clear

@@ -408,7 +408,11 @@ pop [&lt;stash&gt;]
 <div class="para"><p>Applying the state can fail with conflicts; in this case, it is not

 removed from the stash list. You need to resolve the conflicts by hand

 and call <tt>git stash drop</tt> manually afterwards.</p></div>

-<div class="para"><p>When no <tt>&lt;stash&gt;</tt> is given, <tt>stash@{0}</tt> is assumed. See also <tt>apply</tt>.</p></div>

+<div class="para"><p>If the <tt>--index</tt> option is used, then tries to reinstate not only the working

+tree's changes, but also the index's ones. However, this can fail, when you

+have conflicts (which are stored in the index, where you therefore can no

+longer apply the changes as they were originally).</p></div>

+<div class="para"><p>When no <tt>&lt;stash&gt;</tt> is given, <tt>stash@{0}</tt> is assumed.</p></div>

 </dd>

 <dt>

 apply [--index] [&lt;stash&gt;]

@@ -417,10 +421,6 @@ apply [--index] [&lt;stash&gt;]
 <p>

         Like <tt>pop</tt>, but do not remove the state from the stash list.

 </p>

-<div class="para"><p>If the <tt>--index</tt> option is used, then tries to reinstate not only the working

-tree's changes, but also the index's ones. However, this can fail, when you

-have conflicts (which are stored in the index, where you therefore can no

-longer apply the changes as they were originally).</p></div>

 </dd>

 <dt>

 branch &lt;branchname&gt; [&lt;stash&gt;]

@@ -586,7 +586,7 @@ $ git commit foo -m 'Remaining parts'</tt></pre>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-05-31 21:53:08 UTC

+Last updated 2009-06-09 15:46:27 UTC

 </div>

 </div>

 </body>