Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Tutorial typofix.
author
Linus Torvalds
<torvalds@osdl.org>
Wed, 27 Jul 2005 03:04:22 +0000
(20:04 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 27 Jul 2005 18:53:49 +0000
(11:53 -0700)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/tutorial.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
54c6870
)
diff --git
a/Documentation/tutorial.txt
b/Documentation/tutorial.txt
index ede48ebc31f5f02756590a9ccbc8324cb621f782..74e2e0a3f064d8d42b97add1b497a4d58065bf4c 100644
(file)
--- 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
message about your adventures in git-merge-land.
After you're done, start up "gitk --all" to see graphically what the
-history looks like. Noti
v
e that "mybranch" still exists, and you can
+history looks like. Noti
c
e 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
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