[PATCH] cvsimport: document that -M can be used multiple times
From: Philippe Bruhat (BooK) <hidden>
Date: 2016-06-15 22:44:15
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Also document the capture behaviour (source branch name in $1) Signed-off-by: Philippe Bruhat (BooK) <redacted> --- Documentation/git-cvsimport.txt | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 6f91b9e..58eefd4 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 <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 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 <regex>:: Skip paths matching the regex.
--
1.5.4.2.187.gfc276