From: Philippe Bruhat (BooK Date: Thu, 28 Feb 2008 10:18:23 +0000 (+0100) Subject: cvsimport: document that -M can be used multiple times X-Git-Tag: v1.5.5-rc0~87^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c832a78b15f8ffcb4e6f1f6f6d8b7a607ba5d06;p=git.git cvsimport: document that -M can be used multiple times Also document the capture behaviour (source branch name in $1) Signed-off-by: Philippe Bruhat (BooK) Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index 6f91b9ea2..58eefd42e 100644 --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@ -102,13 +102,17 @@ 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 + will enable default regexes that try to capture the source branch name from the commit message. -M :: Attempt to detect merges based on the commit message with a custom 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. ++ +This option can be used several times to provide several detection regexes. -S :: Skip paths matching the regex.