diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-10-01 16:23:18 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-10-01 16:23:18 +0000 |
| commit | 58992c945be1eab6cb6bc22216c90de22b30341f (patch) | |
| tree | ef64019796298d16c6aa89daeee1915946566bb3 /git-stash.html | |
| parent | d41d6d099f367a8602959a419e485658e8724996 (diff) | |
| download | git-htmldocs-58992c945be1eab6cb6bc22216c90de22b30341f.tar.gz | |
Autogenerated HTML docs for v1.5.3.3-131-g34c6d
Diffstat (limited to 'git-stash.html')
| -rw-r--r-- | git-stash.html | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/git-stash.html b/git-stash.html index ec8f78fcc..7c27cc909 100644 --- a/git-stash.html +++ b/git-stash.html @@ -338,7 +338,7 @@ show [<stash>] </p>
</dd>
<dt>
-apply [<stash>]
+apply [--index] [<stash>]
</dt>
<dd>
<p>
@@ -348,6 +348,10 @@ apply [<stash>] </p>
<p>This operation can fail with conflicts; you need to resolve them
by hand in the working tree.</p>
+<p>If the <tt>--index</tt> option is used, then tries to reinstate not only the working
+tree's changes, but also the index's ones. However, this can fail, when you
+have conflicts (which are stored in the index, where you therefore can no
+longer apply the changes as they were originally).</p>
</dd>
<dt>
clear
@@ -456,7 +460,7 @@ $ git stash apply </div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Aug-2007 09:20:37 UTC
+Last updated 01-Oct-2007 16:22:45 UTC
</div>
</div>
</body>
|