From 8608b334343fd51f13e100f8f1a7a2788c13d6c5 Mon Sep 17 00:00:00 2001 From: Sergei Organov Date: Wed, 13 Feb 2008 17:31:17 +0300 Subject: git-cvsimport.txt: fix '-M' description. 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 Signed-off-by: Junio C Hamano --- Documentation/git-cvsimport.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation') 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 :: 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 :: Skip paths matching the regex. -- cgit v1.3 From 846688726c388cf7fc92ac5cc9f3576e93847e15 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 12 Feb 2008 01:12:57 +0100 Subject: git clone -s documentation: force a new paragraph for the NOTE It should be loud and clear. Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano --- Documentation/git-clone.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index 2341881614..975824301a 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -62,12 +62,13 @@ OPTIONS .git/objects/info/alternates to share the objects with the source repository. The resulting repository starts out without any object of its own. - *NOTE*: this is a possibly dangerous operation; do *not* use - it unless you understand what it does. If you clone your - repository using this option, then delete branches in the - source repository and then run linkgit:git-gc[1] using the - '--prune' option in the source repository, it may remove - objects which are referenced by the cloned repository. ++ +*NOTE*: this is a possibly dangerous operation; do *not* use +it unless you understand what it does. If you clone your +repository using this option, then delete branches in the +source repository and then run linkgit:git-gc[1] using the +'--prune' option in the source repository, it may remove +objects which are referenced by the cloned repository. -- cgit v1.3