X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-cvsimport-script.txt;h=d01a15d8a3a60b58aaa5d084b07bfe5809956e54;hb=de2b82c65dac0e9768bc32f38e96b61d0b778843;hp=ae46b2f0722387ce7cb4b30e5867b11c7bd0de72;hpb=fbfd60d65142848299513dfa6b477d0f5299cc15;p=git.git

diff --git a/Documentation/git-cvsimport-script.txt b/Documentation/git-cvsimport-script.txt
index ae46b2f07..d01a15d8a 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.