summaryrefslogtreecommitdiffstats
path: root/git-svn.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-30 18:31:35 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-30 18:31:35 +0000
commit7f80ae8006f163acc614aebc362adf92788b20a6 (patch)
tree8f80fadfe851ea2ffbc0827cfb27f407d8e50cfc /git-svn.html
parent90ccff355e6fc4705005296023480aa3c957ce7e (diff)
downloadgit-htmldocs-7f80ae8006f163acc614aebc362adf92788b20a6.tar.gz
Autogenerated HTML docs for v1.6.0-rc1-27-g9b6bf
Diffstat (limited to 'git-svn.html')
-rw-r--r--git-svn.html28
1 files changed, 13 insertions, 15 deletions
diff --git a/git-svn.html b/git-svn.html
index a740b8a4e..cbac2b3d6 100644
--- a/git-svn.html
+++ b/git-svn.html
@@ -325,16 +325,16 @@ git-svn(1) Manual Page
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="para"><p><em>git-svn</em> is a simple conduit for changesets between Subversion and git.
-It is not to be confused with <a href="git-svnimport.html">git-svnimport(1)</a>, which is
-read-only.</p></div>
-<div class="para"><p><em>git-svn</em> was originally designed for an individual developer who wants a
-bidirectional flow of changesets between a single branch in Subversion
-and an arbitrary number of branches in git. Since its inception,
-<em>git-svn</em> has gained the ability to track multiple branches in a manner
-similar to <em>git-svnimport</em>.</p></div>
-<div class="para"><p><em>git-svn</em> is especially useful when it comes to tracking repositories
-not organized in the way Subversion developers recommend (trunk,
-branches, tags directories).</p></div>
+It provides a bidirectional flow of changes between a Subversion and a git
+respository.</p></div>
+<div class="para"><p><em>git-svn</em> can track a single Subversion branch simply by using a
+URL to the branch, follow branches laid out in the Subversion recommended
+method (trunk, branches, tags directories) with the --stdlayout option, or
+follow branches in any layout with the -T/-t/-b options (see options to
+<em>init</em> below, and also the <em>clone</em> command).</p></div>
+<div class="para"><p>Once tracking a Subversion branch (with any of the above methods), the git
+repository can be updated from Subversion by the <em>fetch</em> command and
+Subversion updated from git by the <em>dcommit</em> command.</p></div>
</div>
<h2 id="_commands">COMMANDS</h2>
<div class="sectionbody">
@@ -715,8 +715,7 @@ environment). This command has the same behaviour.</td>
<dd>
<p>
Commits the diff of two tree-ish arguments from the
- command-line. This command is intended for interoperability with
- <em>git-svnimport</em> and does not rely on being inside an <tt>git-svn
+ command-line. This command does not rely on being inside an <tt>git-svn
init</tt>-ed repository. This command takes three arguments, (a) the
original tree to diff against, (b) the new tree result, (c) the
URL of the target Subversion repository. The final argument
@@ -865,8 +864,7 @@ config key: svn.findcopiesharder</div></div>
</dt>
<dd>
<p>
-Syntax is compatible with the files used by <em>git-svnimport</em> and
-<em>git-cvsimport</em>:
+Syntax is compatible with the file used by <em>git-cvsimport</em>:
</p>
<div class="listingblock">
<div class="content">
@@ -1221,7 +1219,7 @@ should be manually entered with a text-editor or using <em>git-config</em>.</p><
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-06 05:17:04 UTC
+Last updated 2008-07-30 18:31:06 UTC
</div>
</div>
</body>