Autogenerated HTML docs for v1.5.0.2-273-g8ab3

1 files changed, 104 insertions, 83 deletions

diff --git a/git-svn.html b/git-svn.html
index 2fd6550c4..ba80e48ad 100644
--- a/git-svn.html
+++ b/git-svn.html
@@ -373,14 +373,20 @@ branches, tags directories).</p>
         transports (eg svn+ssh://), you must include the username in

         the URL, eg svn+ssh://foo@svn.bar.com/project

 </p>

-<p>--prefix=&lt;prefix&gt;

+</dd>

+<dt>

+--prefix=&lt;prefix&gt;

+</dt>

+<dd>

+<p>

         This allows one to specify a prefix which is prepended

         to the names of remotes if trunk/branches/tags are

         specified.  The prefix does not automatically include a

         trailing slash, so be sure you include one in the

         argument if that is what you want.  This is useful if

         you wish to track multiple projects that share a common

-        repository.</p>

+        repository.

+</p>

 </dd>

 <dt>

 <em>fetch</em>

@@ -417,23 +423,14 @@ branches, tags directories).</p>
         This fetches revisions from the SVN parent of the current HEAD

         and rebases the current (uncommitted to SVN) work against it.

 </p>

-<div class="literalblock">

-<div class="content">

-<pre><tt>This works similarly to 'svn update' or 'git-pull' except that

-it preserves linear history with 'git-rebase' instead of

-'git-merge' for ease of dcommit-ing with git-svn.</tt></pre>

-</div></div>

-<div class="literalblock">

-<div class="content">

-<pre><tt>This accepts all options that 'git-svn fetch' and 'git-rebase'

-accepts.  However '--fetch-all' only fetches from the current

-[svn-remote], and not all [svn-remote] definitions.</tt></pre>

-</div></div>

-<div class="literalblock">

-<div class="content">

-<pre><tt>Like 'git-rebase'; this requires that the working tree be clean

-and have no uncommitted changes.</tt></pre>

-</div></div>

+<p>This works similarly to <em>svn update</em> or <em>git-pull</em> except that

+it preserves linear history with <em>git-rebase</em> instead of

+<em>git-merge</em> for ease of dcommit-ing with git-svn.</p>

+<p>This accepts all options that <em>git-svn fetch</em> and <em>git-rebase</em>

+accepts.  However <em>--fetch-all</em> only fetches from the current

+[svn-remote], and not all [svn-remote] definitions.</p>

+<p>Like <em>git-rebase</em>; this requires that the working tree be clean

+and have no uncommitted changes.</p>

 </dd>

 <dt>

 <em>dcommit</em>

@@ -453,6 +450,8 @@ and have no uncommitted changes.</tt></pre>
         cleaner, more linear history.

 </p>

 </dd>

+</dl>

+<dl>

 <dt>

 <em>log</em>

 </dt>

@@ -461,36 +460,68 @@ and have no uncommitted changes.</tt></pre>
         This should make it easy to look up svn log messages when svn

         users refer to -r/--revision numbers.

 </p>

-<div class="literalblock">

-<div class="content">

-<pre><tt>The following features from `svn log' are supported:</tt></pre>

-</div></div>

-<div class="literalblock">

-<div class="content">

-<pre><tt>--revision=&lt;n&gt;[:&lt;n&gt;] - is supported, non-numeric args are not:

-                       HEAD, NEXT, BASE, PREV, etc ...

--v/--verbose         - it's not completely compatible with

-                       the --verbose output in svn log, but

-                       reasonably close.

---limit=&lt;n&gt;          - is NOT the same as --max-count,

-                       doesn't count merged/excluded commits

---incremental        - supported</tt></pre>

-</div></div>

-<div class="literalblock">

-<div class="content">

-<pre><tt>New features:</tt></pre>

-</div></div>

-<div class="literalblock">

-<div class="content">

-<pre><tt>--show-commit        - shows the git commit sha1, as well

---oneline            - our version of --pretty=oneline</tt></pre>

-</div></div>

-<div class="literalblock">

-<div class="content">

-<pre><tt>Any other arguments are passed directly to `git log'</tt></pre>

-</div></div>

+<p>The following features from `svn log' are supported:</p>

+<dl>

+<dt>

+--revision=&lt;n&gt;[:&lt;n&gt;]

+</dt>

+<dd>

+<p>

+        is supported, non-numeric args are not:

+        HEAD, NEXT, BASE, PREV, etc &#8230;

+</p>

+</dd>

+<dt>

+-v/--verbose

+</dt>

+<dd>

+<p>

+        it's not completely compatible with the --verbose

+        output in svn log, but reasonably close.

+</p>

+</dd>

+<dt>

+--limit=&lt;n&gt;

+</dt>

+<dd>

+<p>

+        is NOT the same as --max-count, doesn't count

+        merged/excluded commits

+</p>

 </dd>

 <dt>

+--incremental

+</dt>

+<dd>

+<p>

+        supported

+</p>

+</dd>

+</dl>

+<p>New features:</p>

+<dl>

+<dt>

+--show-commit

+</dt>

+<dd>

+<p>

+        shows the git commit sha1, as well

+</p>

+</dd>

+<dt>

+--oneline

+</dt>

+<dd>

+<p>

+        our version of --pretty=oneline

+</p>

+</dd>

+</dl>

+<p>Any other arguments are passed directly to `git log'</p>

+</dd>

+</dl>

+<dl>

+<dt>

 <em>set-tree</em>

 </dt>

 <dd>

@@ -659,24 +690,21 @@ after the authors-file is modified should continue operation.</p>
 <dt>

 --repack[=&lt;n&gt;]

 </dt>

+<dt>

+--repack-flags=&lt;flags&gt;

+</dt>

 <dd>

 <p>

---repack-flags=&lt;flags&gt;

-        These should help keep disk usage sane for large fetches

-        with many revisions.

+These should help keep disk usage sane for large fetches

+with many revisions.

 </p>

-<div class="literalblock">

-<div class="content">

-<pre><tt>--repack takes an optional argument for the number of revisions

+<p>--repack takes an optional argument for the number of revisions

 to fetch before repacking.  This defaults to repacking every

-1000 commits fetched if no argument is specified.</tt></pre>

-</div></div>

-<div class="literalblock">

-<div class="content">

-<pre><tt>--repack-flags are passed directly to gitlink:git-repack[1].</tt></pre>

-</div></div>

-<p>config key: svn.repack

-config key: svn.repackflags</p>

+1000 commits fetched if no argument is specified.</p>

+<p>--repack-flags are passed directly to <a href="git-repack.html">git-repack(1)</a>.</p>

+<div class="verseblock">

+<div class="content">config key: svn.repack

+config key: svn.repackflags</div></div>

 </dd>

 <dt>

 -m

@@ -768,20 +796,14 @@ svn-remote.&lt;name&gt;.noMetadata
 </dt>

 <dd>

 <p>

-        This gets rid of the git-svn-id: lines at the end of every commit.

+This gets rid of the git-svn-id: lines at the end of every commit.

 </p>

-<div class="literalblock">

-<div class="content">

-<pre><tt>If you lose your .git/svn/git-svn/.rev_db file, git-svn will not

+<p>If you lose your .git/svn/git-svn/.rev_db file, git-svn will not

 be able to rebuild it and you won't be able to fetch again,

-either.  This is fine for one-shot imports.</tt></pre>

-</div></div>

-<div class="literalblock">

-<div class="content">

-<pre><tt>The 'git-svn log' command will not work on repositories using

-this, either.  Using this conflicts with the 'useSvmProps'

-option for (hopefully) obvious reasons.</tt></pre>

-</div></div>

+either.  This is fine for one-shot imports.</p>

+<p>The <em>git-svn log</em> command will not work on repositories using

+this, either.  Using this conflicts with the <em>useSvmProps</em>

+option for (hopefully) obvious reasons.</p>

 </dd>

 <dt>

 svn.useSvmProps

@@ -791,19 +813,16 @@ svn-remote.&lt;name&gt;.useSvmProps
 </dt>

 <dd>

 <p>

-        This allows git-svn to re-map repository URLs and UUIDs from

-        mirrors created using SVN::Mirror (or svk) for metadata.

+This allows git-svn to re-map repository URLs and UUIDs from

+mirrors created using SVN::Mirror (or svk) for metadata.

 </p>

-<div class="literalblock">

-<div class="content">

-<pre><tt>If an SVN revision has a property, "svm:headrev", it is likely

+<p>If an SVN revision has a property, "svm:headrev", it is likely

 that the revision was created by SVN::Mirror (also used by SVK).

 The property contains a repository UUID and a revision.  We want

 to make it look like we are mirroring the original URL, so

 introduce a helper function that returns the original identity

 URL and UUID, and use it when generating metadata in commit

-messages.</tt></pre>

-</div></div>

+messages.</p>

 </dd>

 <dt>

 svn.useSvnsyncProps

@@ -837,7 +856,9 @@ and these settings should never be changed once they are set.</p>
 section because they affect the <em>git-svn-id:</em> metadata line.</p>

 </dd>

 </dl>

-<h3>Basic Examples</h3>

+</div>

+<h2>BASIC EXAMPLES</h2>

+<div class="sectionbody">

 <p>Tracking and contributing to a the trunk of a Subversion-managed project:</p>

 <div class="listingblock">

 <div class="content">

@@ -870,7 +891,7 @@ section because they affect the <em>git-svn-id:</em> metadata line.</p>
 # with the appropriate name):

         git reset --hard remotes/trunk

 # You may only dcommit to one branch/tag/trunk at a time.  The usage

-# of dcommit/rebase/show-ignore should be teh same as above.</tt></pre>

+# of dcommit/rebase/show-ignore should be the same as above.</tt></pre>

 </div></div>

 </div>

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

@@ -945,7 +966,7 @@ should be manually entered with a text-editor or using
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 23-Feb-2007 11:13:37 UTC

+Last updated 02-Mar-2007 10:34:23 UTC

 </div>

 </div>

 </body>