X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-cvsimport.txt;h=58eefd42e504cf34178719080fd4f75a0b9ea621;hb=31a3c6bb45aa61e45f1663871620eaf742f0abbb;hp=6f91b9ea2a17df8fc8e3c00fdf0d5c74a6c17950;hpb=f1a8cc635455a65567d040349327b9ea4adb479b;p=git.git 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.