diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-03 02:12:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-03 02:12:27 +0300 |
| commit | ac6aa16279ec06633070f5ab9ca414136a292395 (patch) | |
| tree | 39c96f0a3415d93f16de3e7bcd1b8e20027828d5 /Documentation | |
| parent | d2c425aa2bb8543ea08ca44b04ffacc972a7ad61 (diff) | |
| parent | 3c832a78b15f8ffcb4e6f1f6f6d8b7a607ba5d06 (diff) | |
Merge branch 'pb/cvsimport'
* pb/cvsimport:
cvsimport: document that -M can be used multiple times
cvsimport: allow for multiple -M options
cvsimport: have default merge regex allow for dashes in the branch name
Diffstat (limited to 'Documentation')
| -rw-r--r-- | 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 6f91b9ea2a..58eefd42e5 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. |