Autogenerated HTML docs for v2.14.2-746-g8fb8a9

1 files changed, 10 insertions, 8 deletions

diff --git a/git-rebase.html b/git-rebase.html
index ba1142b44..527c3a4cf 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -1358,13 +1358,15 @@ without an explicit <code>--interactive</code>.</p></div>
 <dd>

 <p>

         When the commit log message begins with "squash! &#8230;" (or

-        "fixup! &#8230;"), and there is a commit whose title begins with

-        the same &#8230;, automatically modify the todo list of rebase -i

-        so that the commit marked for squashing comes right after the

-        commit to be modified, and change the action of the moved

-        commit from <code>pick</code> to <code>squash</code> (or <code>fixup</code>).  Ignores subsequent

-        "fixup! " or "squash! " after the first, in case you referred to an

-        earlier fixup/squash with <code>git commit --fixup/--squash</code>.

+        "fixup! &#8230;"), and there is already a commit in the todo list that

+        matches the same <code>...</code>, automatically modify the todo list of rebase

+        -i so that the commit marked for squashing comes right after the

+        commit to be modified, and change the action of the moved commit

+        from <code>pick</code> to <code>squash</code> (or <code>fixup</code>).  A commit matches the <code>...</code> if

+        the commit subject matches, or if the <code>...</code> refers to the commit&#8217;s

+        hash. As a fall-back, partial matches of the commit subject work,

+        too.  The recommended way to create fixup/squash commits is by using

+        the <code>--fixup</code>/<code>--squash</code> options of <a href="git-commit.html">git-commit(1)</a>.

 </p>

 <div class="paragraph"><p>This option is only valid when the <code>--interactive</code> option is used.</p></div>

 <div class="paragraph"><p>If the <code>--autosquash</code> option is enabled by default using the

@@ -2043,7 +2045,7 @@ reorder commits tend to produce counterintuitive results.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2017-09-10 17:38:46 JST

+Last updated 2017-10-03 16:10:36 JST

 </div>

 </div>

 </body>