Autogenerated HTML docs for v1.6.2.1-389-geed1

1 files changed, 8 insertions, 8 deletions

diff --git a/git-rebase.html b/git-rebase.html
index 03d634706..8cb223aae 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -718,7 +718,7 @@ resolve
 <dd>

 <p>

         This can only resolve two heads (i.e. the current branch

-        and another branch you pulled from) using 3-way merge

+        and another branch you pulled from) using a 3-way merge

         algorithm.  It tries to carefully detect criss-cross

         merge ambiguities and is considered generally safe and

         fast.

@@ -729,9 +729,9 @@ recursive
 </dt>

 <dd>

 <p>

-        This can only resolve two heads using 3-way merge

-        algorithm.  When there are more than one common

-        ancestors that can be used for 3-way merge, it creates a

+        This can only resolve two heads using a 3-way merge

+        algorithm.  When there is more than one common

+        ancestor that can be used for 3-way merge, it creates a

         merged tree of the common ancestors and uses that as

         the reference tree for the 3-way merge.  This has been

         reported to result in fewer merge conflicts without

@@ -747,11 +747,11 @@ octopus
 </dt>

 <dd>

 <p>

-        This resolves more than two-head case, but refuses to do

-        complex merge that needs manual resolution.  It is

+        This resolves cases with more than two heads, but refuses to do

+        a complex merge that needs manual resolution.  It is

         primarily meant to be used for bundling topic branch

         heads together.  This is the default merge strategy when

-        pulling or merging more than one branches.

+        pulling or merging more than one branch.

 </p>

 </dd>

 <dt>

@@ -1117,7 +1117,7 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-03-19 17:47:41 UTC

+Last updated 2009-03-26 08:39:14 UTC

 </div>

 </div>

 </body>