Skip to content
This repository has been archived by the owner on Apr 6, 2019. It is now read-only.

Commit

Permalink
Fix up markdown code blocks and examples
Browse files Browse the repository at this point in the history
  • Loading branch information
mss authored and nirvdrum committed Jun 9, 2009
1 parent f97ae98 commit 210e072
Showing 1 changed file with 38 additions and 38 deletions.
76 changes: 38 additions & 38 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -13,50 +13,50 @@ Examples

Say I have this code in svn:

trunk
...
branches
1.x
2.x
tags
1.0.0
1.0.1
1.0.2
1.1.0
2.0.0
trunk
...
branches
1.x
2.x
tags
1.0.0
1.0.1
1.0.2
1.1.0
2.0.0

git-svn will go through the commit history to build a new git repo. It will
import all branches and tags as remote svn branches, whereas what you really
want is git-native local branches and git tag objects. So after importing this
project I'll get:

$ git branch
* master
$ git branch -a
* master
1.x
2.x
tags/1.0.0
tags/1.0.1
tags/1.0.2
tags/1.1.0
tags/2.0.0
trunk
$ git tag -l
[ empty ]
$ git branch
* master
$ git branch -a
* master
1.x
2.x
tags/1.0.0
tags/1.0.1
tags/1.0.2
tags/1.1.0
tags/2.0.0
trunk
$ git tag -l
[ empty ]

After svn2git is done with your project, you'll get this instead:

$ git branch
* master
1.x
2.x
$ git tag -l
1.0.0
1.0.1
1.0.2
1.1.0
2.0.0
$ git branch
* master
1.x
2.x
$ git tag -l
1.0.0
1.0.1
1.0.2
1.1.0
2.0.0

Finally, it makes sure the HEAD of master is the same as the current trunk of
the svn repo.
Expand Down Expand Up @@ -118,12 +118,12 @@ Authors
To convert all your svn authors to git format, create a file somewhere on your
system with the list of conversions to make, one per line, for example:

jcoglan = James Coglan <[email protected]>
stnick = Santa Claus <[email protected]>
jcoglan = James Coglan <[email protected]>
stnick = Santa Claus <[email protected]>

Then pass an +authors+ option to +svn2git+ pointing to your file:

svn2git http://repos.com/myproject --authors ~/authors.txt
$ svn2git http://svn.example.com/path/to/repo --authors ~/authors.txt

Alternatively, you can place the authors file into ~/.svn2git/authors and
svn2git will load it out of there. This allows you to build up one authors
Expand Down

0 comments on commit 210e072

Please sign in to comment.