Merge branch 'maint'

[git.git] / Documentation / git-svn.txt

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 1e644ca6dc8c42be81f52243a1af992c9d56f21c..84c8f3cde0b781ef1579b38a17430dc405115190 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -149,6 +149,22 @@ and have no uncommitted changes.
        is very strongly discouraged.
 --
 
        is very strongly discouraged.
 --
 

+'branch'::
+       Create a branch in the SVN repository.
+
+-m;;
+--message;;
+       Allows to specify the commit message.
+
+-t;;
+--tag;;
+       Create a tag by using the tags_subdir instead of the branches_subdir
+       specified during git svn init.
+
+'tag'::
+       Create a tag in the SVN repository. This is a shorthand for
+       'branch -t'.
+

 'log'::
        This should make it easy to look up svn log messages when svn
        users refer to -r/--revision numbers.
 'log'::
        This should make it easy to look up svn log messages when svn
        users refer to -r/--revision numbers.


@@ -372,7 +388,8 @@ Passed directly to 'git-rebase' when using 'dcommit' if a
 -n::
 --dry-run::
 
 -n::
 --dry-run::
 

-This can be used with the 'dcommit' and 'rebase' commands.
+This can be used with the 'dcommit', 'rebase', 'branch' and 'tag'
+commands.

 
 For 'dcommit', print out the series of git arguments that would show
 which diffs would be committed to SVN.
 
 For 'dcommit', print out the series of git arguments that would show
 which diffs would be committed to SVN.


@@ -381,6 +398,9 @@ For 'rebase', display the local branch associated with the upstream svn
 repository associated with the current branch and the URL of svn
 repository that will be fetched from.
 
 repository associated with the current branch and the URL of svn
 repository that will be fetched from.
 

+For 'branch' and 'tag', display the urls that will be used for copying when
+creating the branch or tag.
+

 --
 
 ADVANCED OPTIONS
 --
 
 ADVANCED OPTIONS


@@ -473,7 +493,7 @@ Tracking and contributing to the trunk of a Subversion-managed project:
 
 ------------------------------------------------------------------------
 # Clone a repo (like git clone):
 
 ------------------------------------------------------------------------
 # Clone a repo (like git clone):

-       git svn clone http://svn.foo.org/project/trunk
+       git svn clone http://svn.example.com/project/trunk

 # Enter the newly cloned directory:
        cd trunk
 # You should be on master branch, double-check with git-branch
 # Enter the newly cloned directory:
        cd trunk
 # You should be on master branch, double-check with git-branch


@@ -495,9 +515,11 @@ Tracking and contributing to an entire Subversion-managed project
 
 ------------------------------------------------------------------------
 # Clone a repo (like git clone):
 
 ------------------------------------------------------------------------
 # Clone a repo (like git clone):

-       git svn clone http://svn.foo.org/project -T trunk -b branches -t tags
+       git svn clone http://svn.example.com/project -T trunk -b branches -t tags

 # View all branches and tags you have cloned:
        git branch -r
 # View all branches and tags you have cloned:
        git branch -r

+# Create a new branch in SVN
+    git svn branch waldo

 # Reset your master to trunk (or any other branch, replacing 'trunk'
 # with the appropriate name):
        git reset --hard remotes/trunk
 # Reset your master to trunk (or any other branch, replacing 'trunk'
 # with the appropriate name):
        git reset --hard remotes/trunk


@@ -514,7 +536,7 @@ have each person clone that repository with 'git-clone':
 
 ------------------------------------------------------------------------
 # Do the initial import on a server
 
 ------------------------------------------------------------------------
 # Do the initial import on a server

-       ssh server "cd /pub && git svn clone http://svn.foo.org/project
+       ssh server "cd /pub && git svn clone http://svn.example.com/project

 # Clone locally - make sure the refs/remotes/ space matches the server
        mkdir project
        cd project
 # Clone locally - make sure the refs/remotes/ space matches the server
        mkdir project
        cd project


@@ -523,7 +545,7 @@ have each person clone that repository with 'git-clone':
        git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
        git fetch
 # Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server)
        git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
        git fetch
 # Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server)

-       git svn init http://svn.foo.org/project
+       git svn init http://svn.example.com/project

 # Pull the latest changes from Subversion
        git svn rebase
 ------------------------------------------------------------------------
 # Pull the latest changes from Subversion
        git svn rebase
 ------------------------------------------------------------------------