summaryrefslogtreecommitdiff
path: root/Documentation/tutorial-2.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-30 00:09:59 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-30 00:09:59 -0700
commit62b693a0705c55dbc5573946f1f3fc6175cd2620 (patch)
treecb9f0c9c22aca3edce3d6a25aaf56b3c36c197f0 /Documentation/tutorial-2.txt
parentMerge branch 'jc/lt-tree-n-cache-tree' into next (diff)
parentsend-email: do not pass bogus address to local sendmail binary (diff)
downloadtgif-62b693a0705c55dbc5573946f1f3fc6175cd2620.tar.xz
Merge branch 'master' into next
* master: send-email: do not pass bogus address to local sendmail binary Add a basic test case for git send-email, and fix some real bugs discovered. Fix a bug in email extraction used in git-send-email. Add support for --bcc to git-send-email. git-send-email: Add References: headers to emails, in addition to In-Reply-To: git-clean fails on files beginning with a dash git-svn: remove assertion that broke with older versions of svn git-svn: t0001: workaround a heredoc bug in old versions of dash Documentation: fix a tutorial-2 typo Documentation: retitle the git-core tutorial documentation: add brief mention of cat-file to tutorial part I documentation: mention gitk font adjustment in tutorial Fix some documentation typoes
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 08d3453e5c..9c9500c1f1 100644
--- a/Documentation/tutorial-2.txt
+++ b/Documentation/tutorial-2.txt
@@ -377,7 +377,7 @@ At this point you should know everything necessary to read the man
pages for any of the git commands; one good place to start would be
with the commands mentioned in link:everyday.html[Everyday git]. You
should be able to find any unknown jargon in the
-link:glossary.html[Glosssay].
+link:glossary.html[Glossary].
The link:cvs-migration.html[CVS migration] document explains how to
import a CVS repository into git, and shows how to use git in a