diff options
| author | Martin Langhoff <martin@ng.eduforge.org> | 2005-08-16 22:35:27 +1200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-17 14:53:39 -0700 |
| commit | db4b65821e65138177de9afbce70f141cc831224 (patch) | |
| tree | 01248c4c6921a83479bfa3b7bf11c272e036b9d1 /Documentation | |
| parent | da139813a7242f96e6926fd15881b9df94625132 (diff) | |
| download | git-db4b65821e65138177de9afbce70f141cc831224.tar.gz | |
[PATCH] Add merge detection to git-cvsimport
Added -m and -M flags for git-cvsimport to detect merge commits in cvs.
While this trusts the commit message, in repositories where merge commits
indicate 'merged from FOOBRANCH' the import works surprisingly well.
Even if some merges from CVS are bogus or incomplete, the resulting
branches are in better state to go forward (and merge) than without any
merge detection.
Signed-off-by: Martin Langhoff <martin.langhoff@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-cvsimport-script.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Documentation/git-cvsimport-script.txt b/Documentation/git-cvsimport-script.txt index ae46b2f072..d01a15d8a3 100644 --- a/Documentation/git-cvsimport-script.txt +++ b/Documentation/git-cvsimport-script.txt @@ -12,7 +12,7 @@ SYNOPSIS 'git-cvsimport-script' [ -o <branch-for-HEAD> ] [ -h ] [ -v ] [ -d <CVSROOT> ] [ -p <options-for-cvsps> ] [ -C <GIT_repository> ] [ -i ] [ -k ] - [ -s <subst> ] [ <CVS_module> ] + [ -s <subst> ] [ -m ] [ -M regex ] [ <CVS_module> ] DESCRIPTION @@ -58,6 +58,16 @@ OPTIONS If you need to pass multiple options, separate them with a comma. +-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. + +-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. + -v:: Verbosity: let 'cvsimport' report what it is doing. |