summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-13 22:33:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-13 22:33:19 (GMT)
commitaa8d53ec387a7baf72ab5e3a91c35bb5bf20eb4d (patch)
tree8e9410d69333688d32ccab097beaa48b10850833 /Documentation
parent41e2edf41a6d501f1b8beca7f1f0bcbe9296dcc2 (diff)
parentd8e87570c32b190af3991d180f37adb8cf5eb99c (diff)
downloadgit-aa8d53ec387a7baf72ab5e3a91c35bb5bf20eb4d.zip
git-aa8d53ec387a7baf72ab5e3a91c35bb5bf20eb4d.tar.gz
git-aa8d53ec387a7baf72ab5e3a91c35bb5bf20eb4d.tar.bz2
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')
-rw-r--r--Documentation/git-clone.txt13
-rw-r--r--Documentation/git-cvsimport.txt4
2 files changed, 9 insertions, 8 deletions
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 2341881..9758243 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.
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index dbce503..6f91b9e 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.