notes: fix core.notesRef documentation

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

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 82d03b4ced9cb7e34feca325d0ac7b41923de976..8d0c421b80b5ff110d33583cb1bc5a3b417cad90 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -109,7 +109,7 @@ COMMANDS
 
 This works similarly to `svn update` or 'git-pull' except that
 it preserves linear history with 'git-rebase' instead of
 
 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 dcommiting with 'git-svn'.
+'git-merge' for ease of dcommitting with 'git-svn'.

 
 This accepts all options that 'git-svn fetch' and 'git-rebase'
 accept.  However, '--fetch-all' only fetches from the current
 
 This accepts all options that 'git-svn fetch' and 'git-rebase'
 accept.  However, '--fetch-all' only fetches from the current


@@ -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


@@ -498,6 +518,8 @@ Tracking and contributing to an entire Subversion-managed project
        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
        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

+# 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


@@ -522,6 +544,8 @@ have each person clone that repository with 'git-clone':
        git remote add origin server:/pub/project
        git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
        git fetch
        git remote add origin server:/pub/project
        git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
        git fetch

+# Create a local branch from one of the branches just fetched
+       git checkout -b master FETCH_HEAD

 # 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.example.com/project
 # Pull the latest changes from Subversion
 # 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.example.com/project
 # Pull the latest changes from Subversion