summaryrefslogtreecommitdiff
path: root/Documentation/git-cvsimport.txt
diff options
context:
space:
mode:
authorLibravatar Ville Skyttä <ville.skytta@iki.fi>2010-07-20 00:17:17 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-20 16:59:17 -0700
commit6b677a28ffded042da18e3aefbb01d28e4a1b11b (patch)
tree83c264fd63e96280937313cd3cce4555fa622acd /Documentation/git-cvsimport.txt
parentt/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_fail (diff)
downloadtgif-6b677a28ffded042da18e3aefbb01d28e4a1b11b.tar.xz
Documentation: spelling fixes
[jc: with wording changes from Jonathan Nieder] Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-cvsimport.txt')
-rw-r--r--Documentation/git-cvsimport.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 8bcd875a67..608cd63fc3 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -188,7 +188,7 @@ ISSUES
------
Problems related to timestamps:
- * If timestamps of commits in the cvs repository are not stable enough
+ * If timestamps of commits in the CVS repository are not stable enough
to be used for ordering commits changes may show up in the wrong
order.
* If any files were ever "cvs import"ed more than once (e.g., import of
@@ -201,7 +201,7 @@ Problems related to branches:
* Branches on which no commits have been made are not imported.
* All files from the branching point are added to a branch even if
- never added in cvs.
+ never added in CVS.
* This applies to files added to the source branch *after* a daughter
branch was created: if previously no commit was made on the daughter
branch they will erroneously be added to the daughter branch in git.