Skip to content

Commit 6fe7a30

Browse files
kiniEric Wong
authored andcommitted
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 <[email protected]> Signed-off-by: Eric Wong <[email protected]>
1 parent e618c39 commit 6fe7a30

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Documentation/git-svn.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ COMMANDS
104104
'fetch'::
105105
Fetch unfetched revisions from the Subversion remote we are
106106
tracking. The name of the [svn-remote "..."] section in the
107-
.git/config file may be specified as an optional command-line
108-
argument.
107+
$GIT_DIR/config file may be specified as an optional
108+
command-line argument.
109109

110110
--localtime;;
111111
Store Git commit times in the local timezone instead of UTC. This
@@ -684,7 +684,7 @@ svn-remote.<name>.noMetadata::
684684
+
685685
This option can only be used for one-shot imports as 'git svn'
686686
will not be able to fetch again without metadata. Additionally,
687-
if you lose your .git/svn/\*\*/.rev_map.* files, 'git svn' will not
687+
if you lose your $GIT_DIR/svn/\*\*/.rev_map.* files, 'git svn' will not
688688
be able to rebuild them.
689689
+
690690
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
977977
handle name collisions (for example, if two branches from different paths have
978978
the same name, or if a branch and a tag have the same name). In these cases,
979979
use 'init' to set up your Git repository then, before your first 'fetch', edit
980-
the .git/config file so that the branches and tags are associated with
981-
different name spaces. For example:
980+
the $GIT_DIR/config file so that the branches and tags are associated
981+
with different name spaces. For example:
982982

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

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

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

10661066
SEE ALSO
10671067
--------

0 commit comments

Comments
 (0)