summaryrefslogtreecommitdiff
path: root/Documentation/glossary.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-05 20:54:42 -0800
committerJunio C Hamano <junkio@cox.net>2006-01-05 20:54:42 -0800
commit5df466c507ee2dd81c2e9002c3fedf3536cde0dc (patch)
tree92fff315690007bbbdaa9116570a8a49b01f5420 /Documentation/glossary.txt
parent58e3fb40f7ca1c28f9105c15166884f80bb22e55 (diff)
parent92e802c6ccb96d1b5e8561b0a136d43d82253293 (diff)
downloadgit-5df466c507ee2dd81c2e9002c3fedf3536cde0dc.tar.gz
Merge fixes up to GIT 1.0.7
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/glossary.txt')
-rw-r--r--Documentation/glossary.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 520f4c50fc..2331be5a71 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -19,7 +19,7 @@ hash::
In git's context, synonym to object name.
object database::
- Stores a set of "objects", and an individial object is identified
+ Stores a set of "objects", and an individual object is identified
by its object name. The objects usually live in `$GIT_DIR/objects/`.
blob object::