summaryrefslogtreecommitdiff
path: root/Documentation/tutorial-2.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-06-04 00:01:52 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-04 00:01:52 -0700
commitf63237a18e951b93ac46a0e594f286255e1eaaaf (patch)
treea131e9466bc5ca7ca42e31e71274ce3152dc8615 /Documentation/tutorial-2.txt
parentMerge branch 'jc/fmt-patch' into next (diff)
parentCleanup git-send-email.perl:extract_valid_email (diff)
downloadtgif-f63237a18e951b93ac46a0e594f286255e1eaaaf.tar.xz
Merge branch 'vb/sendemail' into next
* vb/sendemail: Cleanup git-send-email.perl:extract_valid_email read-tree --reset: update working tree file for conflicted paths. Documentation: Spelling fixes Builtin git-rev-parse. fetch: do not report "same" unless -verbose.
Diffstat (limited to 'Documentation/tutorial-2.txt')
-rw-r--r--Documentation/tutorial-2.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/tutorial-2.txt b/Documentation/tutorial-2.txt
index 9c9500c1f1..82c692254e 100644
--- a/Documentation/tutorial-2.txt
+++ b/Documentation/tutorial-2.txt
@@ -49,7 +49,7 @@ tree
A tree can refer to one or more "blob" objects, each corresponding to
a file. In addition, a tree can also refer to other tree objects,
-thus creating a directory heirarchy. You can examine the contents of
+thus creating a directory hierarchy. You can examine the contents of
any tree using ls-tree (remember that a long enough initial portion
of the SHA1 will also work):