Browse Source

git-svn.txt: replace .git with $GIT_DIR

As $GIT_DIR may not equal '.git', it's usually more generally correct to
refer to files in $GIT_DIR rather than in .git .

This will also allow me to link some of the occurrences of '.git' in
git-svn.txt to a new reference target inside this file in an upcoming
commit, because in AsciiDoc definitions apparently can't start with
a '.' character.

Signed-off-by: Keshav Kini <keshav.kini@gmail.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
maint
Keshav Kini 12 years ago committed by Eric Wong
parent
commit
6fe7a30aec
  1. 16
      Documentation/git-svn.txt

16
Documentation/git-svn.txt

@ -104,8 +104,8 @@ COMMANDS
'fetch':: 'fetch'::
Fetch unfetched revisions from the Subversion remote we are Fetch unfetched revisions from the Subversion remote we are
tracking. The name of the [svn-remote "..."] section in the tracking. The name of the [svn-remote "..."] section in the
.git/config file may be specified as an optional command-line $GIT_DIR/config file may be specified as an optional
argument. command-line argument.


--localtime;; --localtime;;
Store Git commit times in the local timezone instead of UTC. This Store Git commit times in the local timezone instead of UTC. This
@ -684,7 +684,7 @@ svn-remote.<name>.noMetadata::
+ +
This option can only be used for one-shot imports as 'git svn' This option can only be used for one-shot imports as 'git svn'
will not be able to fetch again without metadata. Additionally, will not be able to fetch again without metadata. Additionally,
if you lose your .git/svn/\*\*/.rev_map.* files, 'git svn' will not if you lose your $GIT_DIR/svn/\*\*/.rev_map.* files, 'git svn' will not
be able to rebuild them. be able to rebuild them.
+ +
The 'git svn log' command will not work on repositories using The 'git svn log' command will not work on repositories using
@ -977,8 +977,8 @@ When using multiple --branches or --tags, 'git svn' does not automatically
handle name collisions (for example, if two branches from different paths have 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, the same name, or if a branch and a tag have the same name). In these cases,
use 'init' to set up your Git repository then, before your first 'fetch', edit use 'init' to set up your Git repository then, before your first 'fetch', edit
the .git/config file so that the branches and tags are associated with the $GIT_DIR/config file so that the branches and tags are associated
different name spaces. For example: with different name spaces. For example:


branches = stable/*:refs/remotes/svn/stable/* branches = stable/*:refs/remotes/svn/stable/*
branches = debug/*:refs/remotes/svn/debug/* branches = debug/*:refs/remotes/svn/debug/*
@ -1006,7 +1006,7 @@ CONFIGURATION
------------- -------------


'git svn' stores [svn-remote] configuration information in the 'git svn' stores [svn-remote] configuration information in the
repository .git/config file. It is similar the core Git repository $GIT_DIR/config file. It is similar the core Git
[remote] sections except 'fetch' keys do not accept glob [remote] sections except 'fetch' keys do not accept glob
arguments; but they are instead handled by the 'branches' arguments; but they are instead handled by the 'branches'
and 'tags' keys. Since some SVN repositories are oddly and 'tags' keys. Since some SVN repositories are oddly
@ -1060,8 +1060,8 @@ $ git svn branch -d branches/server release-2-3-0


Note that git-svn keeps track of the highest revision in which a branch Note that git-svn keeps track of the highest revision in which a branch
or tag has appeared. If the subset of branches or tags is changed after or tag has appeared. If the subset of branches or tags is changed after
fetching, then .git/svn/.metadata must be manually edited to remove (or fetching, then $GIT_DIR/svn/.metadata must be manually edited to remove
reset) branches-maxRev and/or tags-maxRev as appropriate. (or reset) branches-maxRev and/or tags-maxRev as appropriate.


SEE ALSO SEE ALSO
-------- --------

Loading…
Cancel
Save