diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-07-09 16:49:19 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-07-09 16:49:19 +0000 |
| commit | 48bc1ce61affeee2942cc1290ea0aab6b6e61f91 (patch) | |
| tree | d367ba3c8814d61891baaf5bf40480ef4e55da3e /git-svn.html | |
| parent | ccc4d37316e8b357ae23130491c5c8b255a4924b (diff) | |
| download | git-htmldocs-48bc1ce61affeee2942cc1290ea0aab6b6e61f91.tar.gz | |
Autogenerated HTML docs for v1.6.3.3-444-g4ecbc
Diffstat (limited to 'git-svn.html')
| -rw-r--r-- | git-svn.html | 314 |
1 files changed, 169 insertions, 145 deletions
diff --git a/git-svn.html b/git-svn.html index 740e227e1..441834973 100644 --- a/git-svn.html +++ b/git-svn.html @@ -324,10 +324,10 @@ git-svn(1) Manual Page </div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="para"><p><em>git-svn</em> is a simple conduit for changesets between Subversion and git.
+<div class="para"><p><em>git svn</em> is a simple conduit for changesets between Subversion and git.
It provides a bidirectional flow of changes between a Subversion and a git
repository.</p></div>
-<div class="para"><p><em>git-svn</em> can track a standard Subversion repository,
+<div class="para"><p><em>git svn</em> can track a standard Subversion repository,
following the common "trunk/branches/tags" layout, with the --stdlayout option.
It can also follow branches and tags in any layout with the -T/-t/-b options
(see options to <em>init</em> below, and also the <em>clone</em> command).</p></div>
@@ -344,7 +344,7 @@ Subversion updated from git by the <em>dcommit</em> command.</p></div> <dd>
<p>
Initializes an empty git repository with additional
- metadata directories for <em>git-svn</em>. The Subversion URL
+ metadata directories for <em>git svn</em>. The Subversion URL
may be specified as a command-line argument, or as full
URL arguments to -T/-t/-b. Optionally, the target
directory to operate on can be specified as a second
@@ -423,28 +423,6 @@ Subversion updated from git by the <em>dcommit</em> command.</p></div> </p>
</dd>
<dt>
---use-log-author
-</dt>
-<dd>
-<p>
- When retrieving svn commits into git (as part of fetch, rebase, or
- dcommit operations), look for the first From: or Signed-off-by: line
- in the log message and use that as the author string.
-</p>
-</dd>
-<dt>
---add-author-from
-</dt>
-<dd>
-<p>
- When committing to svn from git (as part of commit or dcommit
- operations), if the existing log message doesn't already have a
- From: or Signed-off-by: line, append a From: line based on the
- git commit's author string. If you use this, then --use-log-author
- will retrieve a valid author string for all commits.
-</p>
-</dd>
-<dt>
--username=<USER>
</dt>
<dd>
@@ -499,7 +477,7 @@ Subversion updated from git by the <em>dcommit</em> command.</p></div> <dd>
<p>
Store Git commit times in the local timezone instead of UTC. This
- makes <em>git-log</em> (even without --date=local) show the same times
+ makes <em>git log</em> (even without --date=local) show the same times
that <tt>svn log</tt> would in the local timezone.
</p>
</dd>
@@ -527,28 +505,63 @@ the same local timezone.</p></div> (including automatic fetches due to <em>clone</em>, <em>dcommit</em>,
<em>rebase</em>, etc) on a given repository.
</p>
-<div class="para"><p>config key: svn-remote.<name>.ignore-paths</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>If the ignore-paths config key is set and the command
-line option is also given, both regular expressions
-will be used.</tt></pre>
-</div></div>
+<div class="verseblock">
+<div class="content">config key: svn-remote.<name>.ignore-paths</div></div>
+<div class="para"><p>If the ignore-paths config key is set and the command line option is
+also given, both regular expressions will be used.</p></div>
<div class="para"><p>Examples:</p></div>
-<div class="literalblock">
+<div class="vlist"><dl>
+<dt>
+Skip "doc*" directory for every fetch
+</dt>
+<dd>
+<p>
++
+</p>
+<div class="listingblock">
<div class="content">
-<pre><tt>--ignore-paths="^doc" - skip "doc*" directory for every
- fetch.</tt></pre>
+<pre><tt>--ignore-paths="^doc"</tt></pre>
</div></div>
-<div class="literalblock">
+</dd>
+<dt>
+Skip "branches" and "tags" of first level directories
+</dt>
+<dd>
+<p>
++
+</p>
+<div class="listingblock">
<div class="content">
-<pre><tt>--ignore-paths="^[^/]+/(?:branches|tags)" - skip
- "branches" and "tags" of first level directories.</tt></pre>
+<pre><tt>--ignore-paths="^[^/]+/(?:branches|tags)"</tt></pre>
</div></div>
</dd>
</dl></div>
</dd>
<dt>
+--use-log-author
+</dt>
+<dd>
+<p>
+ When retrieving svn commits into git (as part of fetch, rebase, or
+ dcommit operations), look for the first From: or Signed-off-by: line
+ in the log message and use that as the author string.
+</p>
+</dd>
+<dt>
+--add-author-from
+</dt>
+<dd>
+<p>
+ When committing to svn from git (as part of commit or dcommit
+ operations), if the existing log message doesn't already have a
+ From: or Signed-off-by: line, append a From: line based on the
+ git commit's author string. If you use this, then --use-log-author
+ will retrieve a valid author string for all commits.
+</p>
+</dd>
+</dl></div>
+</dd>
+<dt>
<em>clone</em>
</dt>
<dd>
@@ -558,10 +571,10 @@ will be used.</tt></pre> or if a second argument is passed; it will create a directory
and work within that. It accepts all arguments that the
<em>init</em> and <em>fetch</em> commands accept; with the exception of
- <em>--fetch-all</em>. After a repository is cloned, the <em>fetch</em>
- command will be able to update revisions without affecting
- the working tree; and the <em>rebase</em> command will be able
- to update the working tree with the latest changes.
+ <em>--fetch-all</em> and <em>--parent</em>. After a repository is cloned,
+ the <em>fetch</em> command will be able to update revisions without
+ affecting the working tree; and the <em>rebase</em> command will be
+ able to update the working tree with the latest changes.
</p>
</dd>
<dt>
@@ -572,13 +585,13 @@ will be used.</tt></pre> This fetches revisions from the SVN parent of the current HEAD
and rebases the current (uncommitted to SVN) work against it.
</p>
-<div class="para"><p>This works similarly to <tt>svn update</tt> or <em>git-pull</em> except that
-it preserves linear history with <em>git-rebase</em> instead of
-<em>git-merge</em> for ease of dcommitting with <em>git-svn</em>.</p></div>
-<div class="para"><p>This accepts all options that <em>git-svn fetch</em> and <em>git-rebase</em>
+<div class="para"><p>This works similarly to <tt>svn update</tt> or <em>git pull</em> except that
+it preserves linear history with <em>git rebase</em> instead of
+<em>git merge</em> for ease of dcommitting with <em>git svn</em>.</p></div>
+<div class="para"><p>This accepts all options that <em>git svn fetch</em> and <em>git rebase</em>
accept. However, <em>--fetch-all</em> only fetches from the current
[svn-remote], and not all [svn-remote] definitions.</p></div>
-<div class="para"><p>Like <em>git-rebase</em>; this requires that the working tree be clean
+<div class="para"><p>Like <em>git rebase</em>; this requires that the working tree be clean
and have no uncommitted changes.</p></div>
<div class="vlist"><dl>
<dt>
@@ -589,7 +602,7 @@ and have no uncommitted changes.</p></div> </dt>
<dd>
<p>
- Do not fetch remotely; only run <em>git-rebase</em> against the
+ Do not fetch remotely; only run <em>git rebase</em> against the
last fetched commit from the upstream SVN.
</p>
</dd>
@@ -604,14 +617,14 @@ and have no uncommitted changes.</p></div> repository, and then rebase or reset (depending on whether or
not there is a diff between SVN and head). This will create
a revision in SVN for each commit in git.
- It is recommended that you run <em>git-svn</em> fetch and rebase (not
+ It is recommended that you run <em>git svn</em> fetch and rebase (not
pull or merge) your commits against the latest changes in the
SVN repository.
An optional revision or branch argument may be specified, and
- causes <em>git-svn</em> to do all work on that revision/branch
+ causes <em>git svn</em> to do all work on that revision/branch
instead of HEAD.
This is advantageous over <em>set-tree</em> (below) because it produces
- cleaner, more linear history.<br />
+ cleaner, more linear history.
</p>
<div class="vlist"><dl>
<dt>
@@ -628,23 +641,19 @@ and have no uncommitted changes.</p></div> <dd>
<p>
Commit to this SVN URL (the full path). This is intended to
- allow existing git-svn repositories created with one transport
+ allow existing <em>git svn</em> repositories created with one transport
method (e.g. <tt>svn://</tt> or <tt>http://</tt> for anonymous read) to be
reused if a user is later given access to an alternate transport
method (e.g. <tt>svn+ssh://</tt> or <tt>https://</tt>) for commit.
</p>
-<div class="para"><p>config key: svn-remote.<name>.commiturl</p></div>
-<div class="para"><p>config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>Using this option for any other purpose (don't ask)
-is very strongly discouraged.</tt></pre>
-</div></div>
+<div class="verseblock">
+<div class="content">config key: svn-remote.<name>.commiturl
+config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)</div></div>
+<div class="para"><p>Using this option for any other purpose (don't ask) is very strongly
+discouraged.</p></div>
</dd>
</dl></div>
</dd>
-</dl></div>
-<div class="vlist"><dl>
<dt>
<em>branch</em>
</dt>
@@ -720,7 +729,10 @@ git config --get-all svn-remote.<name>.tags</tt></pre> <div class="para"><p>The following features from `svn log' are supported:</p></div>
<div class="vlist"><dl>
<dt>
--r/--revision=<n>[:<n>]
+-r <n>[:<n>]
+</dt>
+<dt>
+--revision=<n>[:<n>]
</dt>
<dd>
<p>
@@ -729,7 +741,10 @@ git config --get-all svn-remote.<name>.tags</tt></pre> </p>
</dd>
<dt>
--v/--verbose
+-v
+</dt>
+<dt>
+--verbose
</dt>
<dd>
<p>
@@ -784,7 +799,7 @@ client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour.</td>
</tr></table>
</div>
-<div class="para"><p>Any other arguments are passed directly to <em>git-log</em></p></div>
+<div class="para"><p>Any other arguments are passed directly to <em>git log</em></p></div>
</dd>
<dt>
<em>blame</em>
@@ -796,7 +811,7 @@ environment). This command has the same behaviour.</td> `svn blame' by default. Like the SVN blame command,
local uncommitted changes in the working copy are ignored;
the version of the file in the HEAD revision is annotated. Unknown
- arguments are passed directly to <em>git-blame</em>.
+ arguments are passed directly to <em>git blame</em>.
</p>
<div class="vlist"><dl>
<dt>
@@ -804,7 +819,7 @@ environment). This command has the same behaviour.</td> </dt>
<dd>
<p>
- Produce output in the same format as <em>git-blame</em>, but with
+ Produce output in the same format as <em>git blame</em>, but with
SVN revision numbers instead of git commit hashes. In this mode,
changes that haven't been committed to SVN (including local
working-copy edits) are shown as revision 0.
@@ -812,8 +827,6 @@ environment). This command has the same behaviour.</td> </dd>
</dl></div>
</dd>
-</dl></div>
-<div class="vlist"><dl>
<dt>
<em>find-rev</em>
</dt>
@@ -836,7 +849,7 @@ environment). This command has the same behaviour.</td> absolutely no attempts to do patching when committing to SVN, it
simply overwrites files with those specified in the tree or
commit. All merging is assumed to have taken place
- independently of <em>git-svn</em> functions.
+ independently of <em>git svn</em> functions.
</p>
</dd>
<dt>
@@ -866,12 +879,12 @@ environment). This command has the same behaviour.</td> <dd>
<p>
Commits the diff of two tree-ish arguments from the
- command-line. This command does not rely on being inside an <tt>git-svn
+ command-line. This command does not rely on being inside an <tt>git svn
init</tt>-ed repository. This command takes three arguments, (a) the
original tree to diff against, (b) the new tree result, (c) the
URL of the target Subversion repository. The final argument
- (URL) may be omitted if you are working from a <em>git-svn</em>-aware
- repository (that has been <tt>init</tt>-ed with <em>git-svn</em>).
+ (URL) may be omitted if you are working from a <em>git svn</em>-aware
+ repository (that has been <tt>init</tt>-ed with <em>git svn</em>).
The -r<revision> option is required for this.
</p>
</dd>
@@ -930,11 +943,14 @@ environment). This command has the same behaviour.</td> way to repair the repo is to use <em>reset</em>.
</p>
<div class="para"><p>Only the rev_map and refs/remotes/git-svn are changed. Follow <em>reset</em>
-with a <em>fetch</em> and then <em>git-reset</em> or <em>git-rebase</em> to move local
+with a <em>fetch</em> and then <em>git reset</em> or <em>git rebase</em> to move local
branches onto the new tree.</p></div>
<div class="vlist"><dl>
<dt>
--r/--revision=<n>
+-r <n>
+</dt>
+<dt>
+--revision=<n>
</dt>
<dd>
<p>
@@ -943,7 +959,10 @@ branches onto the new tree.</p></div> </p>
</dd>
<dt>
--p/--parent
+-p
+</dt>
+<dt>
+--parent
</dt>
<dd>
<p>
@@ -975,8 +994,8 @@ git svn fetch</div></div> \
r2---r3---A---B master</tt></pre>
</div></div>
-<div class="para"><p>Then fixup "master" with <em>git-rebase</em>.
-Do NOT use <em>git-merge</em> or your history will not be compatible with a
+<div class="para"><p>Then fixup "master" with <em>git rebase</em>.
+Do NOT use <em>git merge</em> or your history will not be compatible with a
future <em>dcommit</em>!</p></div>
<div class="verseblock">
<div class="content">git rebase --onto remotes/git-svn A^ master</div></div>
@@ -1003,7 +1022,7 @@ future <em>dcommit</em>!</p></div> <dd>
<p>
Only used with the <em>init</em> command.
- These are passed directly to <em>git-init</em>.
+ These are passed directly to <em>git init</em>.
</p>
</dd>
<dt>
@@ -1014,7 +1033,7 @@ future <em>dcommit</em>!</p></div> </dt>
<dd>
<p>
-Used with the <em>fetch</em> command.
+ Used with the <em>fetch</em> command.
</p>
<div class="para"><p>This allows revision ranges for partial/cauterized history
to be supported. $NUMBER, $NUMBER1:$NUMBER2 (numeric ranges),
@@ -1031,25 +1050,26 @@ and lost.</p></div> </dt>
<dd>
<p>
-Only used with the <em>set-tree</em> command.
+ Only used with the <em>set-tree</em> command.
</p>
<div class="para"><p>Read a list of commits from stdin and commit them in reverse
order. Only the leading sha1 is read from each line, so
-<em>git-rev-list --pretty=oneline</em> output can be used.</p></div>
+<em>git rev-list --pretty=oneline</em> output can be used.</p></div>
</dd>
<dt>
--rmdir
</dt>
<dd>
<p>
-Only used with the <em>dcommit</em>, <em>set-tree</em> and <em>commit-diff</em> commands.
+ Only used with the <em>dcommit</em>, <em>set-tree</em> and <em>commit-diff</em> commands.
</p>
<div class="para"><p>Remove directories from the SVN tree if there are no files left
behind. SVN can version empty directories, and they are not
removed by default if there are no files left in them. git
cannot version empty directories. Enabling this flag will make
the commit to SVN act like git.</p></div>
-<div class="para"><p>config key: svn.rmdir</p></div>
+<div class="verseblock">
+<div class="content">config key: svn.rmdir</div></div>
</dd>
<dt>
-e
@@ -1059,12 +1079,13 @@ the commit to SVN act like git.</p></div> </dt>
<dd>
<p>
-Only used with the <em>dcommit</em>, <em>set-tree</em> and <em>commit-diff</em> commands.
+ Only used with the <em>dcommit</em>, <em>set-tree</em> and <em>commit-diff</em> commands.
</p>
<div class="para"><p>Edit the commit message before committing to SVN. This is off by
default for objects that are commits, and forced on when committing
tree objects.</p></div>
-<div class="para"><p>config key: svn.edit</p></div>
+<div class="verseblock">
+<div class="content">config key: svn.edit</div></div>
</dd>
<dt>
-l<num>
@@ -1074,9 +1095,9 @@ tree objects.</p></div> </dt>
<dd>
<p>
-Only used with the <em>dcommit</em>, <em>set-tree</em> and <em>commit-diff</em> commands.
+ Only used with the <em>dcommit</em>, <em>set-tree</em> and <em>commit-diff</em> commands.
</p>
-<div class="para"><p>They are both passed directly to <em>git-diff-tree</em>; see
+<div class="para"><p>They are both passed directly to <em>git diff-tree</em>; see
<a href="git-diff-tree.html">git-diff-tree(1)</a> for more information.</p></div>
<div class="verseblock">
<div class="content">config key: svn.l
@@ -1090,29 +1111,30 @@ config key: svn.findcopiesharder</div></div> </dt>
<dd>
<p>
-Syntax is compatible with the file used by <em>git-cvsimport</em>:
+ Syntax is compatible with the file used by <em>git cvsimport</em>:
</p>
<div class="listingblock">
<div class="content">
<pre><tt> loginname = Joe User <user@example.com></tt></pre>
</div></div>
-<div class="para"><p>If this option is specified and <em>git-svn</em> encounters an SVN
-committer name that does not exist in the authors-file, <em>git-svn</em>
+<div class="para"><p>If this option is specified and <em>git svn</em> encounters an SVN
+committer name that does not exist in the authors-file, <em>git svn</em>
will abort operation. The user will then have to add the
-appropriate entry. Re-running the previous <em>git-svn</em> command
+appropriate entry. Re-running the previous <em>git svn</em> command
after the authors-file is modified should continue operation.</p></div>
-<div class="para"><p>config key: svn.authorsfile</p></div>
+<div class="verseblock">
+<div class="content">config key: svn.authorsfile</div></div>
</dd>
<dt>
--authors-prog=<filename>
</dt>
<dd>
<p>
-If this option is specified, for each SVN committer name that does not
-exist in the authors file, the given file is executed with the committer
-name as the first argument. The program is expected to return a single
-line of the form "Name <email>", which will be treated as if included in
-the authors file.
+ If this option is specified, for each SVN committer name that
+ does not exist in the authors file, the given file is executed
+ with the committer name as the first argument. The program is
+ expected to return a single line of the form "Name <email>",
+ which will be treated as if included in the authors file.
</p>
</dd>
<dt>
@@ -1123,7 +1145,7 @@ the authors file. </dt>
<dd>
<p>
- Make <em>git-svn</em> less verbose. Specify a second time to make it
+ Make <em>git svn</em> less verbose. Specify a second time to make it
even less verbose.
</p>
</dd>
@@ -1135,13 +1157,13 @@ the authors file. </dt>
<dd>
<p>
-These should help keep disk usage sane for large fetches
-with many revisions.
+ These should help keep disk usage sane for large fetches with
+ many revisions.
</p>
<div class="para"><p>--repack takes an optional argument for the number of revisions
to fetch before repacking. This defaults to repacking every
1000 commits fetched if no argument is specified.</p></div>
-<div class="para"><p>--repack-flags are passed directly to <em>git-repack</em>.</p></div>
+<div class="para"><p>--repack-flags are passed directly to <em>git repack</em>.</p></div>
<div class="verseblock">
<div class="content">config key: svn.repack
config key: svn.repackflags</div></div>
@@ -1160,10 +1182,10 @@ config key: svn.repackflags</div></div> </dt>
<dd>
<p>
-These are only used with the <em>dcommit</em> and <em>rebase</em> commands.
+ These are only used with the <em>dcommit</em> and <em>rebase</em> commands.
</p>
-<div class="para"><p>Passed directly to <em>git-rebase</em> when using <em>dcommit</em> if a
-<em>git-reset</em> cannot be used (see <em>dcommit</em>).</p></div>
+<div class="para"><p>Passed directly to <em>git rebase</em> when using <em>dcommit</em> if a
+<em>git reset</em> cannot be used (see <em>dcommit</em>).</p></div>
</dd>
<dt>
-n
@@ -1173,8 +1195,8 @@ 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>, <em>rebase</em>, <em>branch</em> and <em>tag</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>
@@ -1197,10 +1219,10 @@ creating the branch or tag.</p></div> </dt>
<dd>
<p>
-This sets GIT_SVN_ID (instead of using the environment). This
-allows the user to override the default refname to fetch from
-when tracking a single URL. The <em>log</em> and <em>dcommit</em> commands
-no longer require this switch as an argument.
+ This sets GIT_SVN_ID (instead of using the environment). This
+ allows the user to override the default refname to fetch from
+ when tracking a single URL. The <em>log</em> and <em>dcommit</em> commands
+ no longer require this switch as an argument.
</p>
</dd>
<dt>
@@ -1227,7 +1249,8 @@ no longer require this switch as an argument. descended from. This feature is enabled by default, use
--no-follow-parent to disable it.
</p>
-<div class="para"><p>config key: svn.followparent</p></div>
+<div class="verseblock">
+<div class="content">config key: svn.followparent</div></div>
</dd>
</dl></div>
</div>
@@ -1242,12 +1265,12 @@ svn-remote.<name>.noMetadata </dt>
<dd>
<p>
-This gets rid of the <em>git-svn-id:</em> lines at the end of every commit.
+ This gets rid of the <em>git-svn-id:</em> lines at the end of every commit.
</p>
-<div class="para"><p>If you lose your .git/svn/git-svn/.rev_db file, <em>git-svn</em> will not
+<div class="para"><p>If you lose your .git/svn/git-svn/.rev_db file, <em>git svn</em> will not
be able to rebuild it and you won't be able to fetch again,
either. This is fine for one-shot imports.</p></div>
-<div class="para"><p>The <em>git-svn log</em> command will not work on repositories using
+<div class="para"><p>The <em>git svn log</em> command will not work on repositories using
this, either. Using this conflicts with the <em>useSvmProps</em>
option for (hopefully) obvious reasons.</p></div>
</dd>
@@ -1259,8 +1282,8 @@ svn-remote.<name>.useSvmProps </dt>
<dd>
<p>
-This allows <em>git-svn</em> to re-map repository URLs and UUIDs from
-mirrors created using SVN::Mirror (or svk) for metadata.
+ This allows <em>git svn</em> to re-map repository URLs and UUIDs from
+ mirrors created using SVN::Mirror (or svk) for metadata.
</p>
<div class="para"><p>If an SVN revision has a property, "svm:headrev", it is likely
that the revision was created by SVN::Mirror (also used by SVK).
@@ -1289,7 +1312,7 @@ svn-remote.<name>.rewriteRoot <dd>
<p>
This allows users to create repositories from alternate
- URLs. For example, an administrator could run <em>git-svn</em> on the
+ URLs. For example, an administrator could run <em>git svn</em> on the
server locally (accessing via file://) but wish to distribute
the repository with a public http:// or svn:// URL in the
metadata so users of it will see the public URL.
@@ -1300,17 +1323,18 @@ svn.brokenSymlinkWorkaround </dt>
<dd>
<p>
-This disables potentially expensive checks to workaround broken symlinks
-checked into SVN by broken clients. Set this option to "false" if you
-track a SVN repository with many empty blobs that are not symlinks.
-This option may be changed while "git-svn" is running and take effect on
-the next revision fetched. If unset, git-svn assumes this option to be
-"true".
+ This disables potentially expensive checks to workaround
+ broken symlinks checked into SVN by broken clients. Set this
+ option to "false" if you track a SVN repository with many
+ empty blobs that are not symlinks. This option may be changed
+ while <em>git svn</em> is running and take effect on the next
+ revision fetched. If unset, <em>git svn</em> assumes this option to
+ be "true".
</p>
</dd>
</dl></div>
<div class="para"><p>Since the noMetadata, rewriteRoot, useSvnsyncProps and useSvmProps
-options all affect the metadata generated and used by <em>git-svn</em>; they
+options all affect the metadata generated and used by <em>git svn</em>; they
<strong>must</strong> be set in the configuration file before any history is imported
and these settings should never be changed once they are set.</p></div>
<div class="para"><p>Additionally, only one of these four options can be used per-svn-remote
@@ -1325,7 +1349,7 @@ section because they affect the <em>git-svn-id:</em> metadata line.</p></div> 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
+# You should be on master branch, double-check with 'git branch'
git branch
# Do some work and commit locally to git:
git commit ...
@@ -1354,12 +1378,12 @@ section because they affect the <em>git-svn-id:</em> metadata line.</p></div> # You may only dcommit to one branch/tag/trunk at a time. The usage
# of dcommit/rebase/show-ignore should be the same as above.</tt></pre>
</div></div>
-<div class="para"><p>The initial <em>git-svn clone</em> can be quite time-consuming
+<div class="para"><p>The initial <em>git svn clone</em> can be quite time-consuming
(especially for large Subversion repositories). If multiple
people (or one person with multiple machines) want to use
-<em>git-svn</em> to interact with the same Subversion repository, you can
-do the initial <em>git-svn clone</em> to a repository on a server and
-have each person clone that repository with <em>git-clone</em>:</p></div>
+<em>git svn</em> to interact with the same Subversion repository, you can
+do the initial <em>git svn clone</em> to a repository on a server and
+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
@@ -1373,7 +1397,7 @@ have each person clone that repository with <em>git-clone</em>:</p></div> 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)
+# 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
git svn rebase</tt></pre>
@@ -1381,7 +1405,7 @@ have each person clone that repository with <em>git-clone</em>:</p></div> </div>
<h2 id="_rebase_vs_pull_merge">REBASE VS. PULL/MERGE</h2>
<div class="sectionbody">
-<div class="para"><p>Originally, <em>git-svn</em> recommended that the <em>remotes/git-svn</em> branch be
+<div class="para"><p>Originally, <em>git svn</em> recommended that the <em>remotes/git-svn</em> branch be
pulled or merged from. This is because the author favored
<tt>git svn set-tree B</tt> to commit a single head rather than the
<tt>git svn set-tree A..B</tt> notation to commit multiple commits.</p></div>
@@ -1395,7 +1419,7 @@ previous commits in SVN.</p></div> <h2 id="_design_philosophy">DESIGN PHILOSOPHY</h2>
<div class="sectionbody">
<div class="para"><p>Merge tracking in Subversion is lacking and doing branched development
-with Subversion can be cumbersome as a result. While <em>git-svn</em> can track
+with Subversion can be cumbersome as a result. While <em>git svn</em> can track
copy history (including branches and tags) for repositories adopting a
standard layout, it cannot yet represent merge history that happened
inside git back upstream to SVN users. Therefore it is advised that
@@ -1405,22 +1429,22 @@ compatibility with SVN (see the CAVEATS section below).</p></div> <h2 id="_caveats">CAVEATS</h2>
<div class="sectionbody">
<div class="para"><p>For the sake of simplicity and interoperating with a less-capable system
-(SVN), it is recommended that all <em>git-svn</em> users clone, fetch and dcommit
-directly from the SVN server, and avoid all <em>git-clone</em>/<em>pull</em>/<em>merge</em>/<em>push</em>
+(SVN), it is recommended that all <em>git svn</em> users clone, fetch and dcommit
+directly from the SVN server, and avoid all <em>git clone</em>/<em>pull</em>/<em>merge</em>/<em>push</em>
operations between git repositories and branches. The recommended
method of exchanging code between git branches and users is
-<em>git-format-patch</em> and <em>git-am</em>, or just 'dcommit'ing to the SVN repository.</p></div>
-<div class="para"><p>Running <em>git-merge</em> or <em>git-pull</em> is NOT recommended on a branch you
+<em>git format-patch</em> and <em>git am</em>, or just 'dcommit'ing to the SVN repository.</p></div>
+<div class="para"><p>Running <em>git merge</em> or <em>git pull</em> is NOT recommended on a branch you
plan to <em>dcommit</em> from. Subversion does not represent merges in any
reasonable or useful fashion; so users using Subversion cannot see any
merges you've made. Furthermore, if you merge or pull from a git branch
that is a mirror of an SVN branch, <em>dcommit</em> may commit to the wrong
branch.</p></div>
-<div class="para"><p><em>git-clone</em> does not clone branches under the refs/remotes/ hierarchy or
-any <em>git-svn</em> metadata, or config. So repositories created and managed with
-using <em>git-svn</em> should use <em>rsync</em> for cloning, if cloning is to be done
+<div class="para"><p><em>git clone</em> does not clone branches under the refs/remotes/ hierarchy or
+any <em>git svn</em> metadata, or config. So repositories created and managed with
+using <em>git svn</em> should use <em>rsync</em> for cloning, if cloning is to be done
at all.</p></div>
-<div class="para"><p>Since <em>dcommit</em> uses rebase internally, any git branches you <em>git-push</em> to
+<div class="para"><p>Since <em>dcommit</em> uses rebase internally, any git branches you <em>git push</em> to
before <em>dcommit</em> on will require forcing an overwrite of the existing ref
on the remote repository. This is generally considered bad practice,
see the <a href="git-push.html">git-push(1)</a> documentation for details.</p></div>
@@ -1428,7 +1452,7 @@ see the <a href="git-push.html">git-push(1)</a> documentation for details.</p></ already dcommitted. It is considered bad practice to --amend commits
you've already pushed to a remote repository for other users, and
dcommit with SVN is analogous to that.</p></div>
-<div class="para"><p>When using multiple --branches or --tags, <em>git-svn</em> does not automatically
+<div class="para"><p>When using multiple --branches or --tags, <em>git svn</em> does not automatically
handle name collisions (for example, if two branches from different paths have
the same name, or if a branch and a tag have the same name). In these cases,
use <em>init</em> to set up your git repository then, before your first <em>fetch</em>, edit
@@ -1453,7 +1477,7 @@ for git to detect them.</p></div> </div>
<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
-<div class="para"><p><em>git-svn</em> stores [svn-remote] configuration information in the
+<div class="para"><p><em>git svn</em> stores [svn-remote] configuration information in the
repository .git/config file. It is similar the core git
[remote] sections except <em>fetch</em> keys do not accept glob
arguments; but they are instead handled by the <em>branches</em>
@@ -1473,7 +1497,7 @@ listed below are allowed:</p></div> however the remote wildcard may be anywhere as long as it's an
independent path component (surrounded by <em>/</em> or EOL). This
type of configuration is not automatically created by <em>init</em> and
-should be manually entered with a text-editor or using <em>git-config</em>.</p></div>
+should be manually entered with a text-editor or using <em>git config</em>.</p></div>
</div>
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
@@ -1489,7 +1513,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 2009-07-01 02:31:04 UTC
+Last updated 2009-07-09 16:49:00 UTC
</div>
</div>
</body>
|