summaryrefslogtreecommitdiffstats
path: root/git-stash.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-02 03:06:38 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-02 03:06:38 +0000
commitfce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch)
treeffce2ae419b52786a0e567f4fddaadd89016f62c /git-stash.html
parentbb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff)
downloadgit-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'git-stash.html')
-rw-r--r--git-stash.html24
1 files changed, 12 insertions, 12 deletions
diff --git a/git-stash.html b/git-stash.html
index 2a372db68..ccc71e40b 100644
--- a/git-stash.html
+++ b/git-stash.html
@@ -273,20 +273,20 @@ git-stash(1) Manual Page
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-stash</em> (list | show [&lt;stash&gt;] | apply [&lt;stash&gt;] | clear | drop [&lt;stash&gt;] | pop [&lt;stash&gt;])
-<em>git-stash</em> [save [&lt;message&gt;]]</div></div>
+<div class="content"><em>git stash</em> (list | show [&lt;stash&gt;] | apply [&lt;stash&gt;] | clear | drop [&lt;stash&gt;] | pop [&lt;stash&gt;])
+<em>git stash</em> [save [&lt;message&gt;]]</div></div>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
-<p>Use <em>git-stash</em> when you want to record the current state of the
+<p>Use <em>git stash</em> when you want to record the current state of the
working directory and the index, but want to go back to a clean
working directory. The command saves your local modifications away
and reverts the working directory to match the <tt>HEAD</tt> commit.</p>
<p>The modifications stashed away by this command can be listed with
-<tt>git-stash list</tt>, inspected with <tt>git-stash show</tt>, and restored
-(potentially on top of a different commit) with <tt>git-stash apply</tt>.
-Calling git-stash without any arguments is equivalent to <tt>git-stash
-save</tt>. A stash is by default listed as "WIP on <em>branchname</em> &#8230;", but
+<tt>git stash list</tt>, inspected with <tt>git stash show</tt>, and restored
+(potentially on top of a different commit) with <tt>git stash apply</tt>.
+Calling <tt>git stash</tt> without any arguments is equivalent to <tt>git stash save</tt>.
+A stash is by default listed as "WIP on <em>branchname</em> &#8230;", but
you can give a more descriptive message on the command line when
you create one.</p>
<p>The latest stash you created is stored in <tt>$GIT_DIR/refs/stash</tt>; older
@@ -303,7 +303,7 @@ save [&lt;message&gt;]
</dt>
<dd>
<p>
- Save your local modifications to a new <em>stash</em>, and run <tt>git-reset
+ Save your local modifications to a new <em>stash</em>, and run <tt>git reset
--hard</tt> to revert them. This is the default action when no
subcommand is given. The &lt;message&gt; part is optional and gives
the description along with the stashed state.
@@ -325,8 +325,8 @@ list [&lt;options&gt;]
<pre><tt>stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation
stash@{1}: On master: 9cc0589... Add git-stash</tt></pre>
</div></div>
-<p>The command takes options applicable to the <a href="git-log.html">git-log(1)</a>
-command to control what is shown and how.</p>
+<p>The command takes options applicable to the <tt>git-log</tt>
+command to control what is shown and how. See <a href="git-log.html">git-log(1)</a>.</p>
</dd>
<dt>
show [&lt;stash&gt;]
@@ -336,7 +336,7 @@ show [&lt;stash&gt;]
Show the changes recorded in the stash as a diff between the
stashed state and its original parent. When no <tt>&lt;stash&gt;</tt> is given,
shows the latest one. By default, the command shows the diffstat, but
- it will accept any format known to <tt>git-diff</tt> (e.g., <tt>git-stash show
+ it will accept any format known to <tt>git-diff</tt> (e.g., <tt>git stash show
-p stash@{1}</tt> to view the second most recent stash in patch form).
</p>
</dd>
@@ -482,7 +482,7 @@ $ git stash apply
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 01:34:16 UTC
+Last updated 02-Jul-2008 03:02:03 UTC
</div>
</div>
</body>