aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-04-24 21:50:48 -0700
committerJunio C Hamano <gitster@pobox.com>2008-04-24 21:50:48 -0700
commit31c6390d40fe12a46c38d7224da61c6771886f2a (patch)
tree3856f02ce893c6254fcb0940ec57566ec385bb76 /Documentation
parent3ffb58be0a779b47e1e4d3ea584ba301461a3a77 (diff)
parent3ef6a1fe95b0a5aaca21a86651850ef5d62327fa (diff)
downloadgit-31c6390d40fe12a46c38d7224da61c6771886f2a.tar.gz
git-31c6390d40fe12a46c38d7224da61c6771886f2a.tar.xz
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4: t5516: remove ambiguity test (1) Linked glossary from cvs-migration page write-tree: properly detect failure to write tree objects
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/cvs-migration.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt
index ea9890022..00f2e36b2 100644
--- a/Documentation/cvs-migration.txt
+++ b/Documentation/cvs-migration.txt
@@ -8,7 +8,8 @@ designating a single shared repository which people can synchronize with;
this document explains how to do that.
Some basic familiarity with git is required. This
-link:tutorial.html[tutorial introduction to git] should be sufficient.
+link:tutorial.html[tutorial introduction to git] and the
+link:glossary.html[git glossary] should be sufficient.
Developing against a shared repository
--------------------------------------