diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 10:39:00 -0700 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 10:39:00 -0700 |
commit | 52a73116a50506a038bb532116ab5202ab3b5417 (patch) | |
tree | cdb612ecfe9287931e653d9cb95f9ec0120ebd55 /Documentation | |
parent | bc36540e6e1c94cefc1dc1a201800e832eb99194 (diff) | |
parent | 5de70efbd9236e44f122348ec2a1c2967d3bfde8 (diff) | |
download | git-52a73116a50506a038bb532116ab5202ab3b5417.tar.gz |
Merge branch 'dm/svn-branch'
* dm/svn-branch:
Add git-svn branch to allow branch creation in SVN repositories
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-svn.txt | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 82d03b4ced..84c8f3cde0 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -149,6 +149,22 @@ and have no uncommitted changes. 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. @@ -372,7 +388,8 @@ Passed directly to 'git-rebase' when using 'dcommit' if a -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. @@ -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. +For 'branch' and 'tag', display the urls that will be used for copying when +creating the branch or tag. + -- 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 +# 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 |