From f3157244314a66b6293af2f6a283a596367dc80e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 26 Jul 2005 20:04:22 -0700 Subject: Tutorial typofix. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano 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 -- cgit v0.10.2-6-g49f6