summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2005-07-27 03:04:22 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-07-27 18:53:49 (GMT)
commitf3157244314a66b6293af2f6a283a596367dc80e (patch)
treeb3e37506df3415d3eda43dc3512f9163f9c34187 /Documentation
parent54c6870ebf4c364dd809a1a58eb8485855344812 (diff)
downloadgit-f3157244314a66b6293af2f6a283a596367dc80e.zip
git-f3157244314a66b6293af2f6a283a596367dc80e.tar.gz
git-f3157244314a66b6293af2f6a283a596367dc80e.tar.bz2
Tutorial typofix.
Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/tutorial.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index ede48eb..74e2e0a 100644
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -763,7 +763,7 @@ which will very loudly warn you that you're now committing a merge
message about your adventures in git-merge-land.
After you're done, start up "gitk --all" to see graphically what the
-history looks like. Notive that "mybranch" still exists, and you can
+history looks like. Notice that "mybranch" still exists, and you can
switch to it, and continue to work with it if you want to. The
"mybranch" branch will not contain the merge, but next time you merge it
from the "master" branch, git will know how you merged it, so you'll not