diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-02-13 14:33:19 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-13 14:33:19 -0800 |
commit | aa8d53ec387a7baf72ab5e3a91c35bb5bf20eb4d (patch) | |
tree | 8e9410d69333688d32ccab097beaa48b10850833 /Documentation/git-cvsimport.txt | |
parent | Merge git://repo.or.cz/git-gui (diff) | |
parent | config: add test cases for empty value and no value config variables. (diff) | |
download | tgif-aa8d53ec387a7baf72ab5e3a91c35bb5bf20eb4d.tar.xz |
Merge branch 'maint'
* maint:
config: add test cases for empty value and no value config variables.
cvsimport: have default merge regex also match beginning of commit message
git clone -s documentation: force a new paragraph for the NOTE
status: suggest "git rm --cached" to unstage for initial commit
Protect get_author_ident_from_commit() from filenames in work tree
upload-pack: Initialize the exec-path.
bisect: use verbatim commit subject in the bisect log
git-cvsimport.txt: fix '-M' description.
Revert "pack-objects: only throw away data during memory pressure"
Diffstat (limited to 'Documentation/git-cvsimport.txt')
-rw-r--r-- | Documentation/git-cvsimport.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index dbce503694..6f91b9ea2a 100644 --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@ -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. |