Autogenerated HTML docs for v1.8.3.2-768-g91101

1 files changed, 10 insertions, 3 deletions

diff --git a/git-stash.html b/git-stash.html
index a5790bce8..ee1ee9c29 100644
--- a/git-stash.html
+++ b/git-stash.html
@@ -752,7 +752,8 @@ git-stash(1) Manual Page
 <em>git stash</em> ( pop | apply ) [--index] [-q|--quiet] [&lt;stash&gt;]

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

 <em>git stash</em> [save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]

-             [-u|--include-untracked] [-a|--all] [&lt;message&gt;]]

+             [-u|--include-untracked] [-a|--all] [-f|--force]

+             [&lt;message&gt;]]

 <em>git stash</em> clear

 <em>git stash</em> create [&lt;message&gt;]

 <em>git stash</em> store [-m|--message &lt;message&gt;] [-q|--quiet] &lt;commit&gt;</pre>

@@ -786,7 +787,7 @@ is also possible).</p></div>
 <div class="sectionbody">

 <div class="dlist"><dl>

 <dt class="hdlist1">

-save [-p|--patch] [--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [&lt;message&gt;]

+save [-p|--patch] [--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-f|--force] [&lt;message&gt;]

 </dt>

 <dd>

 <p>

@@ -812,6 +813,12 @@ from your worktree. See the &#8220;Interactive Mode&#8221; section of
 <a href="git-add.html">git-add(1)</a> to learn how to operate the <code>--patch</code> mode.</p></div>

 <div class="paragraph"><p>The <code>--patch</code> option implies <code>--keep-index</code>.  You can use

 <code>--no-keep-index</code> to override this.</p></div>

+<div class="paragraph"><p>In some cases, saving a stash could mean irretrievably removing some

+data - if a directory with untracked files replaces a tracked file of

+the same name, the new untracked files are not saved (except in case

+of <code>--include-untracked</code>) but the original tracked file shall be restored.

+By default, <code>stash save</code> will abort in such a case; <code>--force</code> will allow

+it to remove the untracked files.</p></div>

 </dd>

 <dt class="hdlist1">

 list [&lt;options&gt;]

@@ -1079,7 +1086,7 @@ xargs git log --merges --no-walk --grep=WIP</code></pre>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2013-06-27 15:25:55 PDT

+Last updated 2013-07-11 13:51:26 PDT

 </div>

 </div>

 </body>