summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2007-12-18 06:07:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-18 20:00:18 (GMT)
commit02ff62504e12cb1925a59b6956508dc70984c5b4 (patch)
treebdca90b2a4c808f19095e9a0a39b94966b9a7aa9 /Documentation/git.txt
parent4808ab8f87551967d61fc4f4164e2f99e2fa4d71 (diff)
downloadgit-02ff62504e12cb1925a59b6956508dc70984c5b4.zip
git-02ff62504e12cb1925a59b6956508dc70984c5b4.tar.gz
git-02ff62504e12cb1925a59b6956508dc70984c5b4.tar.bz2
Fix some documentation typos.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git.txt')
-rw-r--r--Documentation/git.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index e0f9a44..37235b9 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -502,7 +502,7 @@ as tags and branch heads.
The object database contains objects of three main types: blobs, which
hold file data; trees, which point to blobs and other trees to build up
-directory heirarchies; and commits, which each reference a single tree
+directory hierarchies; and commits, which each reference a single tree
and some number of parent commits.
The commit, equivalent to what other systems call a "changeset" or
@@ -522,7 +522,7 @@ efficiency may later be compressed together into "pack files".
Named pointers called refs mark interesting points in history. A ref
may contain the SHA1 name of an object or the name of another ref. Refs
with names beginning `ref/head/` contain the SHA1 name of the most
-recent commit (or "head") of a branch under developement. SHA1 names of
+recent commit (or "head") of a branch under development. SHA1 names of
tags of interest are stored under `ref/tags/`. A special ref named
`HEAD` contains the name of the currently checked-out branch.