Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Linus Torvalds 2005-07-26 20:04:22 -07:00 коммит произвёл Junio C Hamano
Родитель 54c6870ebf
Коммит f315724431
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -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