Autogenerated HTML docs for v1.8.4-rc3-1-gc1ebd9

gitster · Aug 14, 2013 · 8a91431 · 8a91431
1 parent b893da9
commit 8a91431
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 20 deletions.
diff --git a/git-stash.html b/git-stash.html
@@ -752,8 +752,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
 <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] [-f|--force]
-             [&lt;message&gt;]]
+             [-u|--include-untracked] [-a|--all] [&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>
@@ -787,7 +786,7 @@ <h2 id="_options">OPTIONS</h2>
 <div class="sectionbody">
 <div class="dlist"><dl>
 <dt class="hdlist1">
-save [-p|--patch] [--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-f|--force] [&lt;message&gt;]
+save [-p|--patch] [--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [&lt;message&gt;]
 </dt>
 <dd>
 <p>
@@ -813,12 +812,6 @@ <h2 id="_options">OPTIONS</h2>
 <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;]
@@ -1086,7 +1079,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2013-07-11 13:51:26 PDT
+Last updated 2013-08-14 13:47:23 PDT
 </div>
 </div>
 </body>

diff --git a/git-stash.txt b/git-stash.txt
@@ -14,8 +14,7 @@ SYNOPSIS
 'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
 'git stash' branch <branchname> [<stash>]
 'git stash' [save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]
-	     [-u|--include-untracked] [-a|--all] [-f|--force]
-	     [<message>]]
+	     [-u|--include-untracked] [-a|--all] [<message>]]
 'git stash' clear
 'git stash' create [<message>]
 'git stash' store [-m|--message <message>] [-q|--quiet] <commit>
@@ -45,7 +44,7 @@ is also possible).
 OPTIONS
 -------
 
-save [-p|--patch] [--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-f|--force] [<message>]::
+save [-p|--patch] [--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]::
 
 	Save your local modifications to a new 'stash', and run `git reset
 	--hard` to revert them.  The <message> part is optional and gives
@@ -72,13 +71,6 @@ linkgit:git-add[1] to learn how to operate the `--patch` mode.
 +
 The `--patch` option implies `--keep-index`.  You can use
 `--no-keep-index` to override this.
-+
-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 `--include-untracked`) but the original tracked file shall be restored.
-By default, `stash save` will abort in such a case; `--force` will allow
-it to remove the untracked files.
 
 list [<options>]::