Skip to content

Commit

Permalink
git-cvsimport.txt: fix '-M' description.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sergei Organov authored and Junio C Hamano committed Feb 13, 2008
1 parent 75ad235 commit 8608b33
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Documentation/git-cvsimport.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ If you need to pass multiple options, separate them with a comma.

-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.
Expand Down

0 comments on commit 8608b33

Please sign in to comment.