git-svnimport is no longer supported, so don't mention it in the documentation. This also updates the description, removing the historical discussion, since it mostly dealt with how it differed from svnimport. Noticed by Jurko Gospodnetić <jurko.gospodnetic@xxxxxxxx> Signed-off-by: Brian Gernhardt <benji@xxxxxxxxxxxxxxxxxx> --- Documentation/git-svn.txt | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index e7c0f1c..4d82a08 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -12,18 +12,10 @@ SYNOPSIS DESCRIPTION ----------- 'git-svn' is a simple conduit for changesets between Subversion and git. -It is not to be confused with linkgit:git-svnimport[1], which is -read-only. - -'git-svn' 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, -'git-svn' has gained the ability to track multiple branches in a manner -similar to 'git-svnimport'. - -'git-svn' is especially useful when it comes to tracking repositories -not organized in the way Subversion developers recommend (trunk, -branches, tags directories). +It provides a bidirectional flow of changes between a Subversion and a git +respository. 'git-svn' is especially useful when it comes to tracking +repositories not organized in the way Subversion developers recommend +(trunk, branches, tags directories). COMMANDS -------- @@ -218,8 +210,7 @@ Any other arguments are passed directly to 'git-log' 'commit-diff':: Commits the diff of two tree-ish arguments from the - command-line. This command is intended for interoperability with - 'git-svnimport' and does not rely on being inside an `git-svn + command-line. This command does not rely on being inside an `git-svn init`-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 @@ -317,8 +308,7 @@ config key: svn.findcopiesharder -A<filename>:: --authors-file=<filename>:: -Syntax is compatible with the files used by 'git-svnimport' and -'git-cvsimport': +Syntax is compatible with the file used by 'git-cvsimport': ------------------------------------------------------------------------ loginname = Joe User <user@xxxxxxxxxxx> -- 1.6.0.rc1.154.ge3fc -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
