Autogenerated HTML docs for v1.5.0-rc0-g13e86

1 files changed, 17 insertions, 14 deletions

diff --git a/git-svn.html b/git-svn.html
index 72cc62c36..f92f5e27e 100644
--- a/git-svn.html
+++ b/git-svn.html
@@ -326,11 +326,13 @@ manually joining branches on commit.</p>
 </dt>

 <dd>

 <p>

-        Commit all diffs from a specified head directly to the SVN

+        Commit each diff from a specified head directly to the SVN

         repository, and then rebase or reset (depending on whether or

-        not there is a diff between SVN and head).  It is recommended

-        that you run git-svn fetch and rebase (not pull) your commits

-        against the latest changes in the SVN repository.

+        not there is a diff between SVN and head).  This will create

+        a revision in SVN for each commit in git.

+        It is recommended that you run git-svn fetch and rebase (not

+        pull or merge) your commits against the latest changes in the

+        SVN repository.

         An optional command-line argument may be specified as an

         alternative to HEAD.

         This is advantageous over <em>set-tree</em> (below) because it produces

@@ -814,17 +816,18 @@ See also:
         git-svn multi-init</tt></pre>

 </div></div>

 </div>

-<h2>REBASE VS. PULL</h2>

+<h2>REBASE VS. PULL/MERGE</h2>

 <div class="sectionbody">

 <p>Originally, git-svn recommended that the remotes/git-svn branch be

-pulled from.  This is because the author favored <em>git-svn set-tree B</em>

-to commit a single head rather than the <em>git-svn set-tree A..B</em> notation

-to commit multiple commits.</p>

-<p>If you use <em>git-svn set-tree A..B</em> to commit several diffs and you do not

-have the latest remotes/git-svn merged into my-branch, you should use

-<em>git rebase</em> to update your work branch instead of <em>git pull</em>.  <em>pull</em>

-can cause non-linear history to be flattened when committing into SVN,

-which can lead to merge commits reversing previous commits in SVN.</p>

+pulled or merged from.  This is because the author favored

+<em>git-svn set-tree B</em> to commit a single head rather than the

+<em>git-svn set-tree A..B</em> notation to commit multiple commits.</p>

+<p>If you use <em>git-svn set-tree A..B</em> to commit several diffs and you do

+not have the latest remotes/git-svn merged into my-branch, you should

+use <em>git rebase</em> to update your work branch instead of <em>git pull</em> or

+<em>git merge</em>.  <em>pull/merge</em> can cause non-linear history to be flattened

+when committing into SVN, which can lead to merge commits reversing

+previous commits in SVN.</p>

 </div>

 <h2>DESIGN PHILOSOPHY</h2>

 <div class="sectionbody">

@@ -927,7 +930,7 @@ detect them.</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 05-Jan-2007 07:46:19 UTC

+Last updated 07-Jan-2007 07:43:50 UTC

 </div>

 </div>

 </body>