summaryrefslogtreecommitdiffstats
path: root/git-cvsimport.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-06-08 16:13:44 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-06-08 16:13:44 +0000
commita77a51375dec1ea55c96563953187d6ce3d924cd (patch)
treebd5e64c4f3d367dcf2be694575f0e5edcb03b1a7 /git-cvsimport.txt
parent359b40ddcc057e3c5e382544a151c97db2db5002 (diff)
downloadgit-htmldocs-a77a51375dec1ea55c96563953187d6ce3d924cd.tar.gz
Autogenerated HTML docs for v1.5.2.1-144-gabc40
Diffstat (limited to 'git-cvsimport.txt')
-rw-r--r--git-cvsimport.txt13
1 files changed, 6 insertions, 7 deletions
diff --git a/git-cvsimport.txt b/git-cvsimport.txt
index e0be85654..3985e0164 100644
--- a/git-cvsimport.txt
+++ b/git-cvsimport.txt
@@ -37,7 +37,7 @@ OPTIONS
-d <CVSROOT>::
The root of the CVS archive. May be local (a simple path) or remote;
- currently, only the :local:, :ext: and :pserver: access methods
+ currently, only the :local:, :ext: and :pserver: access methods
are supported. If not given, git-cvsimport will try to read it
from `CVS/Root`. If no such file exists, it checks for the
`CVSROOT` environment variable.
@@ -67,7 +67,7 @@ the old cvs2git tool.
-k::
Kill keywords: will extract files with '-kk' from the CVS archive
to avoid noisy changesets. Highly recommended, but off by default
- to preserve compatibility with early imported trees.
+ to preserve compatibility with early imported trees.
-u::
Convert underscores in tag and branch names to dots.
@@ -89,15 +89,15 @@ If you need to pass multiple options, separate them with a comma.
Instead of calling cvsps, read the provided cvsps output file. Useful
for debugging or when cvsps is being handled outside cvsimport.
--m::
+-m::
Attempt to detect merges based on the commit message. This option
- will enable default regexes that try to capture the name source
- branch name from the commit message.
+ will enable default regexes that try to capture the name source
+ branch name from the commit message.
-M <regex>::
Attempt to detect merges based on the commit message with a custom
regex. It can be used with '-m' to also see the default regexes.
- You must escape forward slashes.
+ You must escape forward slashes.
-S <regex>::
Skip paths matching the regex.
@@ -156,4 +156,3 @@ Documentation by Matthias Urlichs <smurf@smurf.noris.de>.
GIT
---
Part of the gitlink:git[7] suite
-