diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-08-14 13:47:41 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-08-14 13:47:41 -0700 |
commit | 8a91431dc5890984ccc1fa30c63715b170a8eade (patch) | |
tree | fba89f35cf7e444410933d1f4dd74e375e780d39 /git-stash.html | |
parent | b893da98d95faf95a6b2645c57323200ba3fe954 (diff) | |
download | git-htmldocs-8a91431dc5890984ccc1fa30c63715b170a8eade.tar.gz |
Autogenerated HTML docs for v1.8.4-rc3-1-gc1ebd9
Diffstat (limited to 'git-stash.html')
-rw-r--r-- | git-stash.html | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/git-stash.html b/git-stash.html index ee1ee9c29..1ce41a2c8 100644 --- a/git-stash.html +++ b/git-stash.html @@ -752,8 +752,7 @@ git-stash(1) Manual Page <em>git stash</em> ( pop | apply ) [--index] [-q|--quiet] [<stash>]
<em>git stash</em> branch <branchname> [<stash>]
<em>git stash</em> [save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]
- [-u|--include-untracked] [-a|--all] [-f|--force]
- [<message>]]
+ [-u|--include-untracked] [-a|--all] [<message>]]
<em>git stash</em> clear
<em>git stash</em> create [<message>]
<em>git stash</em> store [-m|--message <message>] [-q|--quiet] <commit></pre>
@@ -787,7 +786,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] [-f|--force] [<message>]
+save [-p|--patch] [--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]
</dt>
<dd>
<p>
@@ -813,12 +812,6 @@ from your worktree. See the “Interactive Mode” 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 [<options>]
@@ -1086,7 +1079,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-07-11 13:51:26 PDT
+Last updated 2013-08-14 13:47:23 PDT
</div>
</div>
</body>
|