summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 75ad235)
raw | patch | inline | side by side (parent: 75ad235)
author | Sergei Organov <osv@javad.com> | |
Wed, 13 Feb 2008 14:31:17 +0000 (17:31 +0300) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 13 Feb 2008 19:08:41 +0000 (11:08 -0800) |
Fix '-M' description. Old one reads as if the user can somehow "see"
the default regex when using -M along with -m.
Signed-off-by: Sergei Organov <osv@javad.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
the default regex when using -M along with -m.
Signed-off-by: Sergei Organov <osv@javad.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-cvsimport.txt | patch | blob | history |
index dbce503694049ced5232423ffa11bb9a896e3c52..6f91b9ea2a17df8fc8e3c00fdf0d5c74a6c17950 100644 (file)
-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.
+ regex. It can be used with '-m' to enable the default regexes
+ as well. You must escape forward slashes.
-S <regex>::
Skip paths matching the regex.