diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-07-13 15:00:05 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-13 15:00:05 -0700 |
commit | 92d80370646a0ce43b0c769027492b3c891090aa (patch) | |
tree | cee7315334fee3145cb4badcc7a400e3e763fbac /git-cvsimport.txt | |
parent | 48931e26012d8d7ad1a7e1d9701f52be1b77e45a (diff) | |
download | git-htmldocs-92d80370646a0ce43b0c769027492b3c891090aa.tar.gz |
Autogenerated HTML docs for v2.9.1-273-g79ed4
Diffstat (limited to 'git-cvsimport.txt')
-rw-r--r-- | git-cvsimport.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/git-cvsimport.txt b/git-cvsimport.txt index 00a0679a2..41207a24b 100644 --- a/git-cvsimport.txt +++ b/git-cvsimport.txt @@ -74,10 +74,10 @@ OPTIONS akin to the way 'git clone' uses 'origin' by default. -o <branch-for-HEAD>:: - When no remote is specified (via -r) the 'HEAD' branch + When no remote is specified (via -r) the `HEAD` branch from CVS is imported to the 'origin' branch within the Git - repository, as 'HEAD' already has a special meaning for Git. - When a remote is specified the 'HEAD' branch is named + repository, as `HEAD` already has a special meaning for Git. + When a remote is specified the `HEAD` branch is named remotes/<remote>/master mirroring 'git clone' behaviour. Use this option if you want to import into a different branch. @@ -103,7 +103,7 @@ the old cvs2git tool. -p <options-for-cvsps>:: Additional options for cvsps. - The options '-u' and '-A' are implicit and should not be used here. + The options `-u` and '-A' are implicit and should not be used here. + If you need to pass multiple options, separate them with a comma. @@ -122,7 +122,7 @@ If you need to pass multiple options, separate them with a comma. -M <regex>:: Attempt to detect merges based on the commit message with a custom - regex. It can be used with '-m' to enable the default regexes + regex. It can be used with `-m` to enable the default regexes as well. You must escape forward slashes. + The regex must capture the source branch name in $1. @@ -186,7 +186,7 @@ messages, bug-tracking systems, email archives, and the like. OUTPUT ------ -If '-v' is specified, the script reports what it is doing. +If `-v` is specified, the script reports what it is doing. Otherwise, success is indicated the Unix way, i.e. by simply exiting with a zero exit status. |