From: Keshav Kini <keshav.kini@gmail.com>
To: git@vger.kernel.org
Cc: Eric Wong <normalperson@yhbt.net>, Keshav Kini <keshav.kini@gmail.com>
Subject: [PATCH v2 3/4] git-svn.txt: replace .git with $GIT_DIR
Date: Sun, 29 Sep 2013 18:45:59 -0500 [thread overview]
Message-ID: <1380498360-18387-4-git-send-email-keshav.kini@gmail.com> (raw)
In-Reply-To: <1380498360-18387-1-git-send-email-keshav.kini@gmail.com>
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>
---
Documentation/git-svn.txt | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 62ec727..3ddf545 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -104,8 +104,8 @@ COMMANDS
'fetch'::
Fetch unfetched revisions from the Subversion remote we are
tracking. The name of the [svn-remote "..."] section in the
- .git/config file may be specified as an optional command-line
- argument.
+ $GIT_DIR/config file may be specified as an optional
+ command-line argument.
--localtime;;
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'
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.
+
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
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
-the .git/config file so that the branches and tags are associated with
-different name spaces. For example:
+the $GIT_DIR/config file so that the branches and tags are associated
+with different name spaces. For example:
branches = stable/*:refs/remotes/svn/stable/*
branches = debug/*:refs/remotes/svn/debug/*
@@ -1006,7 +1006,7 @@ CONFIGURATION
-------------
'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
arguments; but they are instead handled by the 'branches'
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
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
-reset) branches-maxRev and/or tags-maxRev as appropriate.
+fetching, then $GIT_DIR/svn/.metadata must be manually edited to remove
+(or reset) branches-maxRev and/or tags-maxRev as appropriate.
SEE ALSO
--------
--
1.8.3.2
next prev parent reply other threads:[~2013-09-29 23:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-23 21:19 [PATCH] git-svn.txt: mention how to rebuild rev_map files Keshav Kini
2013-09-25 19:44 ` Jonathan Nieder
2013-09-25 19:47 ` Eric Wong
2013-09-25 23:37 ` Keshav Kini
2013-09-26 0:06 ` Jonathan Nieder
2013-09-26 2:21 ` Keshav Kini
2013-09-26 2:41 ` Keshav Kini
2013-09-29 23:45 ` [PATCH v2 0/4] git-svn.txt: miscellaneous changes Keshav Kini
2013-09-29 23:45 ` [PATCH v2 1/4] git-svn.txt: fix AsciiDoc formatting error Keshav Kini
2013-09-29 23:45 ` [PATCH v2 2/4] git-svn.txt: reword description of gc command Keshav Kini
2013-09-29 23:45 ` Keshav Kini [this message]
2013-09-29 23:46 ` [PATCH v2 4/4] git-svn.txt: elaborate on rev_map files Keshav Kini
2013-09-30 19:24 ` [PATCH v2 0/4] git-svn.txt: miscellaneous changes Jonathan Nieder
2013-10-10 6:59 ` Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1380498360-18387-4-git-send-email-keshav.kini@gmail.com \
--to=keshav.kini@gmail.com \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).