summaryrefslogtreecommitdiff
path: root/Documentation/tutorial.txt
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2006-05-21 23:49:34 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-22 00:15:43 (GMT)
commite31952da5c52a4c1e028de634204c6bc2504771f (patch)
tree0d81629bdd7274298028e0cffb989ca43cb6bf7e /Documentation/tutorial.txt
parentf1fe3846e4236a05879d7f84b11ae8ea64dd8d0d (diff)
downloadgit-e31952da5c52a4c1e028de634204c6bc2504771f.zip
git-e31952da5c52a4c1e028de634204c6bc2504771f.tar.gz
git-e31952da5c52a4c1e028de634204c6bc2504771f.tar.bz2
tutorial: add discussion of index file, object database
Add a sequel to tutorial.txt which discusses the index file and the object database. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/tutorial.txt')
-rw-r--r--Documentation/tutorial.txt28
1 files changed, 22 insertions, 6 deletions
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index 4c298c6..79781ad 100644
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -442,7 +442,25 @@ $ git diff v2.5:Makefile HEAD:Makefile.in
Next Steps
----------
-Some good commands to explore next:
+This tutorial should be enough to perform basic distributed revision
+control for your projects. However, to fully understand the depth
+and power of git you need to understand two simple ideas on which it
+is based:
+
+ * The object database is the rather elegant system used to
+ store the history of your project--files, directories, and
+ commits.
+
+ * The index file is a cache of the state of a directory tree,
+ used to create commits, check out working directories, and
+ hold the various trees involved in a merge.
+
+link:tutorial-2.html[Part two of this tutorial] explains the object
+database, the index file, and a few other odds and ends that you'll
+need to make the most of git.
+
+If you don't want to consider with that right away, a few other
+digressions that may be interesting at this point are:
* gitlink:git-format-patch[1], gitlink:git-am[1]: These convert
series of git commits into emailed patches, and vice versa,
@@ -456,8 +474,6 @@ Some good commands to explore next:
smart enough to perform a close-to-optimal search even in the
case of complex non-linear history with lots of merged branches.
-Other good starting points include link:everyday.html[Everday GIT
-with 20 Commands Or So] and link:cvs-migration.html[git for CVS
-users]. Also, link:core-tutorial.html[A short git tutorial] gives an
-introduction to lower-level git commands for advanced users and
-developers.
+ * link:everyday.html[Everday GIT with 20 Commands Or So]
+
+ * link:cvs-migration.html[git for CVS users].