summaryrefslogtreecommitdiffstats
path: root/git-stash.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-07-23 00:51:59 +0000
committerJunio C Hamano <junio@kernel.org>2011-07-23 00:51:59 +0000
commit15567bc0c61c951197cb392b835678729534de57 (patch)
tree8be698fd27be92da0c23a77720987071e73b1d69 /git-stash.html
parent708376e8576f6d39b62b27ee9dfe7292c652f728 (diff)
downloadgit-htmldocs-15567bc0c61c951197cb392b835678729534de57.tar.gz
Autogenerated HTML docs for v1.7.6-345-g5c2f8
Diffstat (limited to 'git-stash.html')
-rw-r--r--git-stash.html11
1 files changed, 8 insertions, 3 deletions
diff --git a/git-stash.html b/git-stash.html
index 65e42d843..02a5a295f 100644
--- a/git-stash.html
+++ b/git-stash.html
@@ -420,7 +420,8 @@ git-stash(1) Manual Page
<em>git stash</em> drop [-q|--quiet] [&lt;stash&gt;]
<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] [&lt;message&gt;]]
+<em>git stash</em> [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
+ [-u|--include-untracked] [-a|--all] [&lt;message&gt;]]
<em>git stash</em> clear
<em>git stash</em> create</div>
<div class="verseblock-attribution">
@@ -449,7 +450,7 @@ is also possible).</p></div>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
-save [-p|--patch] [--[no-]keep-index] [-q|--quiet] [&lt;message&gt;]
+save [-p|--patch] [--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [&lt;message&gt;]
</dt>
<dd>
<p>
@@ -462,6 +463,10 @@ save [-p|--patch] [--[no-]keep-index] [-q|--quiet] [&lt;message&gt;]
</p>
<div class="paragraph"><p>If the <tt>--keep-index</tt> option is used, all changes already added to the
index are left intact.</p></div>
+<div class="paragraph"><p>If the <tt>--include-untracked</tt> option is used, all untracked files are also
+stashed and then cleaned up with <tt>git clean</tt>, leaving the working directory
+in a very clean state. If the <tt>--all</tt> option is used instead then the
+ignored files are stashed and cleaned in addition to the untracked files.</p></div>
<div class="paragraph"><p>With <tt>--patch</tt>, you can interactively select hunks from the diff
between HEAD and the working tree to be stashed. The stash entry is
constructed such that its index state is the same as the index state
@@ -714,7 +719,7 @@ xargs git log --merges --no-walk --grep=WIP</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-05-11 20:08:54 UTC
+Last updated 2011-07-23 00:49:30 UTC
</div>
</div>
</body>