summaryrefslogtreecommitdiffstats
path: root/git-svn.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-10-10 15:31:42 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-10-10 15:31:42 +0000
commita476efaaca349e01dfbc4e1009ab534aa511479b (patch)
treeb0f05e148f284deb9030edaf25419f9f704adb32 /git-svn.html
parent7cc912979feaec3ed65d4491e129ed48507f6994 (diff)
downloadgit-htmldocs-a476efaaca349e01dfbc4e1009ab534aa511479b.tar.gz
Autogenerated HTML docs for v1.6.0.2-514-g23abd3
Diffstat (limited to 'git-svn.html')
-rw-r--r--git-svn.html59
1 files changed, 53 insertions, 6 deletions
diff --git a/git-svn.html b/git-svn.html
index 3e736bd2b..4477993c8 100644
--- a/git-svn.html
+++ b/git-svn.html
@@ -576,6 +576,48 @@ is very strongly discouraged.</tt></pre>
</dl></div>
<div class="vlist"><dl>
<dt>
+<em>branch</em>
+</dt>
+<dd>
+<p>
+ Create a branch in the SVN repository.
+</p>
+<div class="vlist"><dl>
+<dt>
+-m
+</dt>
+<dt>
+--message
+</dt>
+<dd>
+<p>
+ Allows to specify the commit message.
+</p>
+</dd>
+<dt>
+-t
+</dt>
+<dt>
+--tag
+</dt>
+<dd>
+<p>
+ Create a tag by using the tags_subdir instead of the branches_subdir
+ specified during git svn init.
+</p>
+</dd>
+</dl></div>
+</dd>
+<dt>
+<em>tag</em>
+</dt>
+<dd>
+<p>
+ Create a tag in the SVN repository. This is a shorthand for
+ <em>branch -t</em>.
+</p>
+</dd>
+<dt>
<em>log</em>
</dt>
<dd>
@@ -951,13 +993,16 @@ These are only used with the <em>dcommit</em> and <em>rebase</em> commands.
</dt>
<dd>
<p>
-This can be used with the <em>dcommit</em> and <em>rebase</em> commands.
+This can be used with the <em>dcommit</em>, <em>rebase</em>, <em>branch</em> and <em>tag</em>
+commands.
</p>
<div class="para"><p>For <em>dcommit</em>, print out the series of git arguments that would show
which diffs would be committed to SVN.</p></div>
<div class="para"><p>For <em>rebase</em>, 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.</p></div>
+<div class="para"><p>For <em>branch</em> and <em>tag</em>, display the urls that will be used for copying when
+creating the branch or tag.</p></div>
</dd>
</dl></div>
</div>
@@ -1084,7 +1129,7 @@ section because they affect the <em>git-svn-id:</em> metadata line.</p></div>
<div class="listingblock">
<div class="content">
<pre><tt># 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
@@ -1105,9 +1150,11 @@ section because they affect the <em>git-svn-id:</em> metadata line.</p></div>
<div class="listingblock">
<div class="content">
<pre><tt># 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
+# 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
@@ -1123,7 +1170,7 @@ have each person clone that repository with <em>git-clone</em>:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt># Do the initial import on a server
- ssh server "cd /pub &amp;&amp; git svn clone http://svn.foo.org/project
+ ssh server "cd /pub &amp;&amp; git svn clone http://svn.example.com/project
# Clone locally - make sure the refs/remotes/ space matches the server
mkdir project
cd project
@@ -1132,7 +1179,7 @@ have each person clone that repository with <em>git-clone</em>:</p></div>
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</tt></pre>
</div></div>
@@ -1236,7 +1283,7 @@ should be manually entered with a text-editor or using <em>git-config</em>.</p><
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-09-19 06:33:14 UTC
+Last updated 2008-10-10 15:30:51 UTC
</div>
</div>
</body>