Autogenerated HTML docs for v2.0.0-rc0-26-g7797

1 files changed, 5 insertions, 16 deletions

diff --git a/git-svn.html b/git-svn.html
index 30d2084b8..a62772235 100644
--- a/git-svn.html
+++ b/git-svn.html
@@ -897,18 +897,16 @@ Subversion updated from Git by the <em>dcommit</em> command.</p></div>
         (refs/remotes/$remote/</strong>). Setting a prefix is also useful

         if you wish to track multiple projects that share a common

         repository.

+        By default, the prefix is set to <em>origin/</em>.

 </p>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

 <div class="title">Note</div>

 </td>

-<td class="content">In Git v2.0, the default prefix will CHANGE from "" (no prefix)

-to "origin/". This is done to put SVN-tracking refs at

-"refs/remotes/origin/<strong>" instead of "refs/remotes/</strong>", and make them

-more compatible with how Git&#8217;s own remote-tracking refs are organized

-(i.e. refs/remotes/$remote/*). You can enjoy the same benefits today,

-by using the --prefix option.</td>

+<td class="content">Before Git v2.0, the default prefix was "" (no prefix). This

+meant that SVN-tracking refs were put at "refs/remotes/*", which is

+incompatible with how Git&#8217;s own remote-tracking refs are organized.</td>

 </tr></table>

 </div>

 </dd>

@@ -2291,15 +2289,6 @@ required, it is easiest to only clone one directory (typically trunk),
 without giving any repository layout options.  If the full history with

 branches and tags is required, the options <em>--trunk</em> / <em>--branches</em> /

 <em>--tags</em> must be used.</p></div>

-<div class="paragraph"><p>When using the options for describing the repository layout (--trunk,

---tags, --branches, --stdlayout), please also specify the --prefix

-option (e.g. <em>--prefix=origin/</em>) to cause your SVN-tracking refs to be

-placed at refs/remotes/origin/* rather than the default refs/remotes/<strong>.

-The former is more compatible with the layout of Git&#8217;s "regular"

-remote-tracking refs (refs/remotes/$remote/</strong>), and may potentially

-prevent similarly named SVN branches and Git remotes from clobbering

-each other. In Git v2.0 the default prefix used (i.e. when no --prefix

-is given) will change from "" (no prefix) to "origin/".</p></div>

 <div class="paragraph"><p>When using multiple --branches or --tags, <em>git svn</em> does not automatically

 handle name collisions (for example, if two branches from different paths have

 the same name, or if a branch and a tag have the same name).  In these cases,

@@ -2426,7 +2415,7 @@ rewinds it.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2013-11-12 15:22:25 PST

+Last updated 2014-04-21 14:07:53 PDT

 </div>

 </div>

 </body>