Autogenerated HTML docs for v2.15.0-164-g4123b

1 files changed, 17 insertions, 12 deletions

diff --git a/git-stash.html b/git-stash.html
index 516ea2642..1a8c9f69e 100644
--- a/git-stash.html
+++ b/git-stash.html
@@ -753,8 +753,6 @@ 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]

-             [-u|--include-untracked] [-a|--all] [&lt;message&gt;]

 <em>git stash</em> [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]

              [-u|--include-untracked] [-a|--all] [-m|--message &lt;message&gt;]]

              [--] [&lt;pathspec&gt;&#8230;]]

@@ -775,7 +773,7 @@ and reverts the working directory to match the <code>HEAD</code> commit.</p></di
 <div class="paragraph"><p>The modifications stashed away by this command can be listed with

 <code>git stash list</code>, inspected with <code>git stash show</code>, and restored

 (potentially on top of a different commit) with <code>git stash apply</code>.

-Calling <code>git stash</code> without any arguments is equivalent to <code>git stash save</code>.

+Calling <code>git stash</code> without any arguments is equivalent to <code>git stash push</code>.

 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></div>

@@ -792,9 +790,6 @@ stash index (e.g. the integer <code>n</code> is equivalent to <code>stash@{n}</c
 <div class="sectionbody">

 <div class="dlist"><dl>

 <dt class="hdlist1">

-save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [&lt;message&gt;]

-</dt>

-<dt class="hdlist1">

 push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message &lt;message&gt;] [--] [&lt;pathspec&gt;&#8230;]

 </dt>

 <dd>

@@ -831,6 +826,16 @@ from your worktree. See the &#8220;Interactive Mode&#8221; section of
 <code>--no-keep-index</code> to override this.</p></div>

 </dd>

 <dt class="hdlist1">

+save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [&lt;message&gt;]

+</dt>

+<dd>

+<p>

+        This option is deprecated in favour of <em>git stash push</em>.  It

+        differs from "stash push" in that it cannot take pathspecs,

+        and any non-option arguments form the message.

+</p>

+</dd>

+<dt class="hdlist1">

 list [&lt;options&gt;]

 </dt>

 <dd>

@@ -871,7 +876,7 @@ pop [--index] [-q|--quiet] [&lt;stash&gt;]
 <p>

         Remove a single stashed state from the stash list and apply it

         on top of the current working tree state, i.e., do the inverse

-        operation of <code>git stash save</code>. The working directory must

+        operation of <code>git stash push</code>. The working directory must

         match the index.

 </p>

 <div class="paragraph"><p>Applying the state can fail with conflicts; in this case, it is not

@@ -891,7 +896,7 @@ apply [--index] [-q|--quiet] [&lt;stash&gt;]
 <p>

         Like <code>pop</code>, but do not remove the state from the stash list. Unlike <code>pop</code>,

         <code>&lt;stash&gt;</code> may be any commit that looks like a commit created by

-        <code>stash save</code> or <code>stash create</code>.

+        <code>stash push</code> or <code>stash create</code>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -906,7 +911,7 @@ branch &lt;branchname&gt; [&lt;stash&gt;]
         <code>stash@{&lt;revision&gt;}</code>, it then drops the <code>&lt;stash&gt;</code>. When no <code>&lt;stash&gt;</code>

         is given, applies the latest one.

 </p>

-<div class="paragraph"><p>This is useful if the branch on which you ran <code>git stash save</code> has

+<div class="paragraph"><p>This is useful if the branch on which you ran <code>git stash push</code> has

 changed enough that <code>git stash apply</code> fails due to conflicts. Since

 the stash entry is applied on top of the commit that was HEAD at the

 time <code>git stash</code> was run, it restores the originally stashed state

@@ -1044,7 +1049,7 @@ Testing partial commits
 </dt>

 <dd>

 <p>

-You can use <code>git stash save --keep-index</code> when you want to make two or

+You can use <code>git stash push --keep-index</code> when you want to make two or

 more commits out of the changes in the work tree, and you want to test

 each change before committing:

 </p>

@@ -1052,7 +1057,7 @@ each change before committing:
 <div class="content">

 <pre><code># ... hack hack hack ...

 $ git add --patch foo            # add just first part to the index

-$ git stash save --keep-index    # save all other changes to the stash

+$ git stash push --keep-index    # save all other changes to the stash

 $ edit/build/test first part

 $ git commit -m 'First part'     # commit fully tested change

 $ git stash pop                  # prepare to work on all other changes

@@ -1100,7 +1105,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 2017-07-01 06:49:23 JST

+Last updated 2017-11-10 15:00:41 JST

 </div>

 </div>

 </body>