Autogenerated HTML docs for v1.5.6-rc0-84-g06f60

diff --git a/git-init.html b/git-init.html
index 75a80104c1959ac3e60026f71f77e4931a315b16..a2e23c928a11bf526a3c63b34c9a00a94aac6b49 100644 (file)
--- a/git-init.html
+++ b/git-init.html
@@ -272,7 +272,7 @@ git-init(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-init</em> [-q | --quiet] [--template=&lt;template_directory&gt;] [--shared[=&lt;permissions&gt;]]</p>\r
+<p><em>git-init</em> [-q | --quiet] [--bare] [--template=&lt;template_directory&gt;] [--shared[=&lt;permissions&gt;]]</p>\r
 </div>\r
 <h2>OPTIONS</h2>\r
 <div class="sectionbody">\r
@@ -286,6 +286,15 @@ Only print error and warning messages, all other output will be suppressed.
 </p>\r
 </dd>\r
 <dt>\r
+--bare\r
+</dt>\r
+<dd>\r
+<p>\r
+Create a bare repository. If GIT_DIR environment is not set, it is set to the\r
+current working directory.\r
+</p>\r
+</dd>\r
+<dt>\r
 --template=&lt;template_directory&gt;\r
 </dt>\r
 <dd>\r
@@ -412,7 +421,7 @@ add all existing file to the index
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Jun-2008 08:21:36 UTC\r
+Last updated 02-Jun-2008 07:30:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-init.txt b/git-init.txt
index b17ae8485cf2d3eb4fc21acba769942a57d33e67..b48c31289923345d8f50342780d30dbcb4e01399 100644 (file)
--- a/git-init.txt
+++ b/git-init.txt
@@ -8,7 +8,7 @@ git-init - Create an empty git repository or reinitialize an existing one
 
 SYNOPSIS
 --------
-'git-init' [-q | --quiet] [--template=<template_directory>] [--shared[=<permissions>]]
+'git-init' [-q | --quiet] [--bare] [--template=<template_directory>] [--shared[=<permissions>]]
 
 
 OPTIONS
@@ -20,6 +20,11 @@ OPTIONS
 
 Only print error and warning messages, all other output will be suppressed.
 
+--bare::
+
+Create a bare repository. If GIT_DIR environment is not set, it is set to the
+current working directory.
+
 --template=<template_directory>::
 
 Provide the directory from which templates will be used.  The default template

diff --git a/git-svn.html b/git-svn.html
index 16fec1961764055abd141a91e5f8218627edf961..111eb7ae8ff07e222b10081580005354ba48f90e 100644 (file)
--- a/git-svn.html
+++ b/git-svn.html
@@ -888,10 +888,13 @@ These are only used with the <em>dcommit</em> and <em>rebase</em> commands.
 </dt>\r
 <dd>\r
 <p>\r
-This is only used with the <em>dcommit</em> command.\r
+This can be used with the <em>dcommit</em> and <em>rebase</em> commands.\r
 </p>\r
-<p>Print out the series of git arguments that would show\r
+<p>For <em>dcommit</em>, print out the series of git arguments that would show\r
 which diffs would be committed to SVN.</p>\r
+<p>For <em>rebase</em>, display the local branch associated with the upstream svn\r
+repository associated with the current branch and the URL of svn\r
+repository that will be fetched from.</p>\r
 </dd>\r
 </dl>\r
 </div>\r
@@ -1171,7 +1174,7 @@ should be manually entered with a text-editor or using
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Jun-2008 08:21:50 UTC\r
+Last updated 02-Jun-2008 07:30:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-svn.txt b/git-svn.txt
index c9e4efe7f4678ecc0beb87b387c71a7ebd0efc71..f4cbd2f212e544f0a17c761a4c870a925db5802b 100644 (file)
--- a/git-svn.txt
+++ b/git-svn.txt
@@ -365,11 +365,15 @@ Passed directly to git-rebase when using 'dcommit' if a
 -n::
 --dry-run::
 
-This is only used with the 'dcommit' command.
+This can be used with the 'dcommit' and 'rebase' commands.
 
-Print out the series of git arguments that would show
+For 'dcommit', print out the series of git arguments that would show
 which diffs would be committed to SVN.
 
+For 'rebase', display the local branch associated with the upstream svn
+repository associated with the current branch and the URL of svn
+repository that will be fetched from.
+
 --
 
 ADVANCED OPTIONS

diff --git a/git.html b/git.html
index 3814b727faa839273e7c010f62201648b0e0932a..a3ffd8cef80da1811817d13ea7b2b84d1e589fdd 100644 (file)
--- a/git.html
+++ b/git.html
@@ -393,7 +393,7 @@ help &#8230;</em>.</p>
 <p>See the references above to get started using git.  The following is\r
 probably more detail than necessary for a first-time user.</p>\r
 <p>The <a href="user-manual.html#git-concepts">git concepts chapter of the\r
-user-manual</a> and the <a href="core-tutorial.html">Core tutorial</a> both provide\r
+user-manual</a> and the <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>[Core tutorial] both provide\r
 introductions to the underlying git architecture.</p>\r
 <p>See also the <a href="howto-index.html">howto</a> documents for some useful\r
 examples.</p>\r
@@ -1635,7 +1635,7 @@ HEAD
 </div>\r
 <h2>Terminology</h2>\r
 <div class="sectionbody">\r
-<p>Please see the <a href="glossary.html">glossary</a> document.</p>\r
+<p>Please see the <a href="gitglossary.html">gitglossary(7)</a>[glossary] document.</p>\r
 </div>\r
 <h2>Environment Variables</h2>\r
 <div class="sectionbody">\r
@@ -1875,7 +1875,7 @@ for further details.</p>
 <div class="sectionbody">\r
 <p>More detail on the following is available from the\r
 <a href="user-manual.html#git-concepts">git concepts chapter of the\r
-user-manual</a> and the <a href="core-tutorial.html">Core tutorial</a>.</p>\r
+user-manual</a> and the <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>[Core tutorial].</p>\r
 <p>A git project normally consists of a working directory with a ".git"\r
 subdirectory at the top level.  The .git directory contains, among other\r
 things, a compressed object database representing the complete history\r
@@ -1946,13 +1946,20 @@ General upbringing is handled by the git-list &lt;git@vger.kernel.org&gt;.
 &lt;david@dgreaves.com&gt;, and later enhanced greatly by the\r
 contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>\r
 </div>\r
+<h2>SEE ALSO</h2>\r
+<div class="sectionbody">\r
+<p><a href="gittutorial.html">gittutorial(7)</a>, <a href="gittutorial-2.html">gittutorial-2(7)</a>,\r
+<a href="giteveryday.html">giteveryday(7)</a>, <a href="gitcvs-migration.html">gitcvs-migration(7)</a>,\r
+<a href="gitglossary.html">gitglossary(7)</a>, <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>,\r
+<a href="user-manual.html">The Git User's Manual</a></p>\r
+</div>\r
 <h2>GIT</h2>\r
 <div class="sectionbody">\r
 <p>Part of the <a href="git.html">git(7)</a> suite</p>\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Jun-2008 08:22:10 UTC\r
+Last updated 02-Jun-2008 07:30:02 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index 7182bb7f7e54685839ef7bade6c8d66cd1772c3b..dae1b4031c12e1bf5b49c42bf4530f865efd656f 100644 (file)
--- a/git.txt
+++ b/git.txt
@@ -174,7 +174,7 @@ See the references above to get started using git.  The following is
 probably more detail than necessary for a first-time user.
 
 The link:user-manual.html#git-concepts[git concepts chapter of the
-user-manual] and the link:core-tutorial.html[Core tutorial] both provide
+user-manual] and the linkgit:gitcore-tutorial[7][Core tutorial] both provide
 introductions to the underlying git architecture.
 
 See also the link:howto-index.html[howto] documents for some useful
@@ -374,7 +374,7 @@ Higher level SCMs may provide and manage additional information in the
 
 Terminology
 -----------
-Please see the link:glossary.html[glossary] document.
+Please see the linkgit:gitglossary[7][glossary] document.
 
 
 Environment Variables
@@ -518,7 +518,7 @@ Discussion[[Discussion]]
 
 More detail on the following is available from the
 link:user-manual.html#git-concepts[git concepts chapter of the
-user-manual] and the link:core-tutorial.html[Core tutorial].
+user-manual] and the linkgit:gitcore-tutorial[7][Core tutorial].
 
 A git project normally consists of a working directory with a ".git"
 subdirectory at the top level.  The .git directory contains, among other
@@ -579,6 +579,13 @@ The documentation for git suite was started by David Greaves
 <david@dgreaves.com>, and later enhanced greatly by the
 contributors on the git-list <git@vger.kernel.org>.
 
+SEE ALSO
+--------
+linkgit:gittutorial[7], linkgit:gittutorial-2[7],
+linkgit:giteveryday[7], linkgit:gitcvs-migration[7],
+linkgit:gitglossary[7], linkgit:gitcore-tutorial[7],
+link:user-manual.html[The Git User's Manual]
+
 GIT
 ---
 Part of the linkgit:git[7] suite

diff --git a/core-tutorial.html b/gitcore-tutorial.html
similarity index 96%
rename from core-tutorial.html
rename to gitcore-tutorial.html
index c80262f311562e6782c35591aee5eb28f931c5e5..58468ee66e0c5e7f880bc5506a17d6a1ce1ad575 100644 (file)
--- a/core-tutorial.html
+++ b/gitcore-tutorial.html
@@ -226,6 +226,7 @@ td.hlist2 {
 @media print {\r
   div#footer-badges { display: none; }\r
 }\r
+include::./stylesheets/xhtml11-manpage.css[]\r
 /* Workarounds for IE6's broken and incomplete CSS2. */\r
 \r
 div.sidebar-content {\r
@@ -255,13 +256,25 @@ div.exampleblock-content {
   padding-left: 0.5em;\r
 }\r
 </style>\r
-<title>A git core tutorial for developers</title>\r
+<title>gitcore-tutorial(7)</title>\r
 </head>\r
 <body>\r
 <div id="header">\r
-<h1>A git core tutorial for developers</h1>\r
+<h1>\r
+gitcore-tutorial(7) Manual Page\r
+</h1>\r
+<h2>NAME</h2>\r
+<div class="sectionbody">\r
+<p>gitcore-tutorial -\r
+   A git core tutorial for developers\r
+</p>\r
+</div>\r
+</div>\r
+<h2>SYNOPSIS</h2>\r
+<div class="sectionbody">\r
+<p>git *</p>\r
 </div>\r
-<h2>Introduction</h2>\r
+<h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
 <p>This tutorial explains how to use the "core" git programs to set up and\r
 work with a git repository.</p>\r
@@ -672,7 +685,7 @@ about the file already).</p>
 we've updated <tt>hello</tt> in the index, <tt>git-diff-files -p</tt> now shows no\r
 differences, but <tt>git-diff-index -p HEAD</tt> still *does* show that the\r
 current state is different from the state we committed. In fact, now\r
-<tt>git-diff-index</tt> shows the same difference whether we use the <tt>&#8212;cached</tt>\r
+<tt>git-diff-index</tt> shows the same difference whether we use the <tt>--cached</tt>\r
 flag or not, since now the index is coherent with the working tree.</p>\r
 <p>Now, since we've updated <tt>hello</tt> in the index, we can commit the new\r
 version. We could do it by writing the tree by hand again, and\r
@@ -756,7 +769,7 @@ diff-index  |    V
 </td>\r
 </tr></table>\r
 </div>\r
-<p>More interestingly, you can also give <tt>git-diff-tree</tt> the <tt>&#8212;pretty</tt> flag,\r
+<p>More interestingly, you can also give <tt>git-diff-tree</tt> the <tt>--pretty</tt> flag,\r
 which tells it to also show the commit message and author and date of the\r
 commit, and you can tell it to show a whole series of diffs.\r
 Alternatively, you can tell it to be "silent", and not show the diffs at\r
@@ -916,7 +929,7 @@ $ git-update-index --refresh</tt></pre>
 It resets the index contents to <tt>HEAD</tt>, and then the <tt>git-update-index</tt>\r
 makes sure to match up all index entries with the checked-out files.\r
 If the original repository had uncommitted changes in its\r
-working tree, <tt>git-update-index &#8212;refresh</tt> notices them and\r
+working tree, <tt>git-update-index --refresh</tt> notices them and\r
 tells you they need to be updated.</p>\r
 <p>The above can also be written as simply</p>\r
 <div class="listingblock">\r
@@ -1174,7 +1187,7 @@ see more complex cases.</p>
 <td class="icon">\r
 <div class="title">Note</div>\r
 </td>\r
-<td class="content">Without the <em>&#8212;more=1</em> option, <em>git-show-branch</em> would not output the\r
+<td class="content">Without the <em>--more=1</em> option, <em>git-show-branch</em> would not output the\r
 <em>[master^]</em> commit, as <em>[mybranch]</em> commit is a common ancestor of\r
 both <em>master</em> and <em>mybranch</em> tips.  Please see <em>git-show-branch</em>\r
 documentation for details.</td>\r
@@ -1187,7 +1200,7 @@ documentation for details.</td>
 </td>\r
 <td class="content">If there were more commits on the <em>master</em> branch after the merge, the\r
 merge commit itself would not be shown by <em>git-show-branch</em> by\r
-default.  You would need to provide <em>&#8212;sparse</em> option to make the\r
+default.  You would need to provide <em>--sparse</em> option to make the\r
 merge commit visible in this case.</td>\r
 </tr></table>\r
 </div>\r
@@ -1506,7 +1519,7 @@ eventually calls <tt>merge</tt> program from RCS suite to perform a
 file-level 3-way merge.  In this case, <tt>merge</tt> detects\r
 conflicts, and the merge result with conflict marks is left in\r
 the working tree..  This can be seen if you run <tt>ls-files\r
-&#8212;stage</tt> again at this point:</p>\r
+--stage</tt> again at this point:</p>\r
 <div class="listingblock">\r
 <div class="content">\r
 <pre><tt>$ git-ls-files --stage\r
@@ -1965,9 +1978,19 @@ and the reason why you preferred changes made in one side over
 the other.  Otherwise it would make the project history harder\r
 to follow, not easier.</p>\r
 </div>\r
+<h2>SEE ALSO</h2>\r
+<div class="sectionbody">\r
+<p><a href="gittutorial.html">gittutorial(7)</a>, <a href="gittutorial-2.html">gittutorial-2(7)</a>,\r
+<a href="giteveryday.html">giteveryday(7)</a>, <a href="gitcvs-migration.html">gitcvs-migration(7)</a>,\r
+<a href="user-manual.html">The Git User's Manual</a></p>\r
+</div>\r
+<h2>GIT</h2>\r
+<div class="sectionbody">\r
+<p>Part of the <a href="git.html">git(7)</a> suite.</p>\r
+</div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Jun-2008 08:21:56 UTC\r
+Last updated 02-Jun-2008 07:30:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/core-tutorial.txt b/gitcore-tutorial.txt
similarity index 99%
rename from core-tutorial.txt
rename to gitcore-tutorial.txt
index b50b5dd487fc7d7fef32408683373e9dade0f3c1..5995a2e1525eeee764b5c141b8c558ccba0a953b 100644 (file)
--- a/core-tutorial.txt
+++ b/gitcore-tutorial.txt
@@ -1,8 +1,16 @@
-A git core tutorial for developers
-==================================
+gitcore-tutorial(7)
+===================
 
-Introduction
-------------
+NAME
+----
+gitcore-tutorial - A git core tutorial for developers
+
+SYNOPSIS
+--------
+git *
+
+DESCRIPTION
+-----------
 
 This tutorial explains how to use the "core" git programs to set up and
 work with a git repository.
@@ -1679,3 +1687,13 @@ merge two at a time, documenting how you resolved the conflicts,
 and the reason why you preferred changes made in one side over
 the other.  Otherwise it would make the project history harder
 to follow, not easier.
+
+SEE ALSO
+--------
+linkgit:gittutorial[7], linkgit:gittutorial-2[7],
+linkgit:giteveryday[7], linkgit:gitcvs-migration[7],
+link:user-manual.html[The Git User's Manual]
+
+GIT
+---
+Part of the linkgit:git[7] suite.

diff --git a/gitcvs-migration.html b/gitcvs-migration.html
index 0de825b9156d565a059548a062f2cef912356bf2..7625355d45c89590827bf5c836050f40230dc972 100644 (file)
--- a/gitcvs-migration.html
+++ b/gitcvs-migration.html
@@ -283,7 +283,7 @@ designating a single shared repository which people can synchronize with;
 this document explains how to do that.</p>\r
 <p>Some basic familiarity with git is required.  This\r
 <a href="gittutorial.html">gittutorial(7)</a>[tutorial introduction to git] and the\r
-<a href="glossary.html">git glossary</a> should be sufficient.</p>\r
+<a href="gitglossary.html">gitglossary(7)</a>[git glossary] should be sufficient.</p>\r
 </div>\r
 <h2>Developing against a shared repository</h2>\r
 <div class="sectionbody">\r
@@ -429,7 +429,10 @@ repositories without the need for a central maintainer.</p>
 </div>\r
 <h2>SEE ALSO</h2>\r
 <div class="sectionbody">\r
-<p><a href="gittutorial.html">gittutorial(7)</a>, <a href="gittutorial-2.html">gittutorial-2(7)</a>,\r
+<p><a href="gittutorial.html">gittutorial(7)</a>,\r
+<a href="gittutorial-2.html">gittutorial-2(7)</a>,\r
+<a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>,\r
+<a href="gitglossary.html">gitglossary(7)</a>,\r
 <a href="everyday.html">Everyday Git</a>,\r
 <a href="user-manual.html">The Git User's Manual</a></p>\r
 </div>\r
@@ -439,7 +442,7 @@ repositories without the need for a central maintainer.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Jun-2008 08:21:56 UTC\r
+Last updated 02-Jun-2008 07:30:06 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/gitcvs-migration.txt b/gitcvs-migration.txt
index c41080502705907d5940f1ea1f0ca68e25f18770..de02a4268eae5213a257cf70a04916baaeb32e62 100644 (file)
--- a/gitcvs-migration.txt
+++ b/gitcvs-migration.txt
@@ -20,7 +20,7 @@ this document explains how to do that.
 
 Some basic familiarity with git is required.  This
 linkgit:gittutorial[7][tutorial introduction to git] and the
-link:glossary.html[git glossary] should be sufficient.
+linkgit:gitglossary[7][git glossary] should be sufficient.
 
 Developing against a shared repository
 --------------------------------------
@@ -184,7 +184,10 @@ repositories without the need for a central maintainer.
 
 SEE ALSO
 --------
-linkgit:gittutorial[7], linkgit:gittutorial-2[7],
+linkgit:gittutorial[7],
+linkgit:gittutorial-2[7],
+linkgit:gitcore-tutorial[7],
+linkgit:gitglossary[7],
 link:everyday.html[Everyday Git],
 link:user-manual.html[The Git User's Manual]
 

diff --git a/glossary.html b/gitglossary.html
similarity index 92%
rename from glossary.html
rename to gitglossary.html
index fbdc633657144aef67d0a6fe80143a6f63d54d8f..b0d4c8675256964a96560c44f7d18ef3e2157721 100644 (file)
--- a/glossary.html
+++ b/gitglossary.html
@@ -226,6 +226,7 @@ td.hlist2 {
 @media print {\r
   div#footer-badges { display: none; }\r
 }\r
+include::./stylesheets/xhtml11-manpage.css[]\r
 /* Workarounds for IE6's broken and incomplete CSS2. */\r
 \r
 div.sidebar-content {\r
@@ -255,13 +256,25 @@ div.exampleblock-content {
   padding-left: 0.5em;\r
 }\r
 </style>\r
-<title>GIT Glossary</title>\r
+<title>gitglossary(7)</title>\r
 </head>\r
 <body>\r
 <div id="header">\r
-<h1>GIT Glossary</h1>\r
+<h1>\r
+gitglossary(7) Manual Page\r
+</h1>\r
+<h2>NAME</h2>\r
+<div class="sectionbody">\r
+<p>gitglossary -\r
+   A GIT Glossary\r
+</p>\r
+</div>\r
+</div>\r
+<h2>SYNOPSIS</h2>\r
+<div class="sectionbody">\r
+<p>*</p>\r
 </div>\r
-<div id="preamble">\r
+<h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
 <dl>\r
 <dt>\r
@@ -421,11 +434,10 @@ to point at the new commit.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Directed acyclic graph. The <a href="#def_commit">commit</a> objects form a\r
+        Directed acyclic graph. The <a href="#def_commit_object">commit objects</a> form a\r
         directed acyclic graph, because they have parents (directed), and the\r
-        graph of commit objects is acyclic (there is no\r
-        <a href="#def_chain">chain</a> which begins and ends with the same\r
-        <a href="#def_object">object</a>).\r
+        graph of commit objects is acyclic (there is no <a href="#def_chain">chain</a>\r
+        which begins and ends with the same <a href="#def_object">object</a>).\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -709,9 +721,10 @@ This commit is referred to as a "merge commit", or sometimes just a
 </dt>\r
 <dd>\r
 <p>\r
-        One of the identifiers\r
-        "<a href="#def_commit">commit</a>","<a href="#def_tree">tree</a>","<a href="#def_tag">tag</a>" or "<a href="#def_blob_object">blob</a>"\r
-        describing the type of an <a href="#def_object">object</a>.\r
+        One of the identifiers "<a href="#def_commit_object">commit</a>",\r
+        "<a href="#def_tree_object">tree</a>", "<a href="#def_tag_object">tag</a>" or\r
+        "<a href="#def_blob_object">blob</a>" describing the type of an\r
+        <a href="#def_object">object</a>.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -772,7 +785,7 @@ This commit is referred to as a "merge commit", or sometimes just a
 <p>\r
         The term <a href="#def_pickaxe">pickaxe</a> refers to an option to the diffcore\r
         routines that help select changes that add or delete a given text\r
-        string. With the <tt>&#8212;pickaxe-all</tt> option, it can be used to view the full\r
+        string. With the <tt>--pickaxe-all</tt> option, it can be used to view the full\r
         <a href="#def_changeset">changeset</a> that introduced or removed, say, a\r
         particular line of text. See <a href="git-diff.html">git-diff(1)</a>.\r
 </p>\r
@@ -954,7 +967,7 @@ This commit is referred to as a "merge commit", or sometimes just a
         parents, even though they are recorded in the <a href="#def_commit_object">commit         object</a>). This is sometimes useful when you are interested only in the\r
         recent history of a project even though the real history recorded in the\r
         upstream is much larger. A shallow repository\r
-        is created by giving the <tt>&#8212;depth</tt> option to <a href="git-clone.html">git-clone(1)</a>, and\r
+        is created by giving the <tt>--depth</tt> option to <a href="git-clone.html">git-clone(1)</a>, and\r
         its history can be later deepened with <a href="git-fetch.html">git-fetch(1)</a>.\r
 </p>\r
 </dd>\r
@@ -1079,10 +1092,19 @@ This commit is referred to as a "merge commit", or sometimes just a
 </dd>\r
 </dl>\r
 </div>\r
+<h2>SEE ALSO</h2>\r
+<div class="sectionbody">\r
+<p><a href="gittutorial.html">gittutorial(7)</a>, <a href="gittutorial-2.html">gittutorial-2(7)</a>,\r
+<a href="giteveryday.html">giteveryday(7)</a>, <a href="gitcvs-migration.html">gitcvs-migration(7)</a>,\r
+<a href="user-manual.html">The Git User's Manual</a></p>\r
+</div>\r
+<h2>GIT</h2>\r
+<div class="sectionbody">\r
+<p>Part of the <a href="git.html">git(7)</a> suite.</p>\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Jun-2008 08:22:02 UTC\r
+Last updated 02-Jun-2008 07:30:08 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/gitglossary.txt b/gitglossary.txt
new file mode 100644 (file)
index 0000000..e8475a0
--- /dev/null
+++ b/gitglossary.txt
@@ -0,0 +1,25 @@
+gitglossary(7)
+==============
+
+NAME
+----
+gitglossary - A GIT Glossary
+
+SYNOPSIS
+--------
+*
+
+DESCRIPTION
+-----------
+
+include::glossary-content.txt[]
+
+SEE ALSO
+--------
+linkgit:gittutorial[7], linkgit:gittutorial-2[7],
+linkgit:giteveryday[7], linkgit:gitcvs-migration[7],
+link:user-manual.html[The Git User's Manual]
+
+GIT
+---
+Part of the linkgit:git[7] suite.

diff --git a/gittutorial-2.html b/gittutorial-2.html
index d04dbe0e6aae642402491349f4879a0990203819..37cc60c4698795f5f7bc127d7a67d4da860e5631 100644 (file)
--- a/gittutorial-2.html
+++ b/gittutorial-2.html
@@ -636,7 +636,7 @@ in the index file is identical to the one in the working directory.</p>
 <p>In addition to being the staging area for new commits, the index file\r
 is also populated from the object database when checking out a\r
 branch, and is used to hold the trees involved in a merge operation.\r
-See the <a href="core-tutorial.html">core tutorial</a> and the relevant man\r
+See the <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>[core tutorial] and the relevant man\r
 pages for details.</p>\r
 </div>\r
 <h2>What next?</h2>\r
@@ -645,7 +645,7 @@ pages for details.</p>
 pages for any of the git commands; one good place to start would be\r
 with the commands mentioned in <a href="everyday.html">Everyday git</a>.  You\r
 should be able to find any unknown jargon in the\r
-<a href="glossary.html">Glossary</a>.</p>\r
+<a href="gitglossary.html">gitglossary(7)</a>[Glossary].</p>\r
 <p>The <a href="user-manual.html">Git User's Manual</a> provides a more\r
 comprehensive introduction to git.</p>\r
 <p>The <a href="gitcvs-migration.html">gitcvs-migration(7)</a>[CVS migration] document explains how to\r
@@ -653,7 +653,7 @@ import a CVS repository into git, and shows how to use git in a
 CVS-like way.</p>\r
 <p>For some interesting examples of git use, see the\r
 <a href="howto-index.html">howtos</a>.</p>\r
-<p>For git developers, the <a href="core-tutorial.html">Core tutorial</a> goes\r
+<p>For git developers, the <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>[Core tutorial] goes\r
 into detail on the lower-level git mechanisms involved in, for\r
 example, creating a new commit.</p>\r
 </div>\r
@@ -661,6 +661,8 @@ example, creating a new commit.</p>
 <div class="sectionbody">\r
 <p><a href="gittutorial.html">gittutorial(7)</a>,\r
 <a href="gitcvs-migration.html">gitcvs-migration(7)</a>,\r
+<a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>,\r
+<a href="gitglossary.html">gitglossary(7)</a>,\r
 <a href="everyday.html">Everyday git</a>,\r
 <a href="user-manual.html">The Git User's Manual</a></p>\r
 </div>\r
@@ -670,7 +672,7 @@ example, creating a new commit.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Jun-2008 08:21:55 UTC\r
+Last updated 02-Jun-2008 07:30:05 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/gittutorial-2.txt b/gittutorial-2.txt
index 5bbbf430561a5528233317cf8f9bc25e8a763c4a..4880ba9ae91efac4cb9b064f5f0e1b42b99110fb 100644 (file)
--- a/gittutorial-2.txt
+++ b/gittutorial-2.txt
@@ -390,7 +390,7 @@ in the index file is identical to the one in the working directory.
 In addition to being the staging area for new commits, the index file
 is also populated from the object database when checking out a
 branch, and is used to hold the trees involved in a merge operation.
-See the link:core-tutorial.html[core tutorial] and the relevant man
+See the linkgit:gitcore-tutorial[7][core tutorial] and the relevant man
 pages for details.
 
 What next?
@@ -400,7 +400,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[Glossary].
+linkgit:gitglossary[7][Glossary].
 
 The link:user-manual.html[Git User's Manual] provides a more
 comprehensive introduction to git.
@@ -412,7 +412,7 @@ CVS-like way.
 For some interesting examples of git use, see the
 link:howto-index.html[howtos].
 
-For git developers, the link:core-tutorial.html[Core tutorial] goes
+For git developers, the linkgit:gitcore-tutorial[7][Core tutorial] goes
 into detail on the lower-level git mechanisms involved in, for
 example, creating a new commit.
 
@@ -420,6 +420,8 @@ SEE ALSO
 --------
 linkgit:gittutorial[7],
 linkgit:gitcvs-migration[7],
+linkgit:gitcore-tutorial[7],
+linkgit:gitglossary[7],
 link:everyday.html[Everyday git],
 link:user-manual.html[The Git User's Manual]
 

diff --git a/gittutorial.html b/gittutorial.html
index 0f704b6572a230dde73a447e10f0320b0e93f926..de893eb9781db5bce65b6850b16cca0062be7379 100644 (file)
--- a/gittutorial.html
+++ b/gittutorial.html
@@ -800,6 +800,8 @@ digressions that may be interesting at this point are:</p>
 <div class="sectionbody">\r
 <p><a href="gittutorial-2.html">gittutorial-2(7)</a>,\r
 <a href="gitcvs-migration.html">gitcvs-migration(7)</a>,\r
+<a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>,\r
+<a href="gitglossary.html">gitglossary(7)</a>,\r
 <a href="everyday.html">Everyday git</a>,\r
 <a href="user-manual.html">The Git User's Manual</a></p>\r
 </div>\r
@@ -809,7 +811,7 @@ digressions that may be interesting at this point are:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Jun-2008 08:21:55 UTC\r
+Last updated 02-Jun-2008 07:30:03 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/gittutorial.txt b/gittutorial.txt
index 898acdb5332a8ff98a88780a42c61de1c379bdb0..722b3232148643896e7d3bdc36f717f726547200 100644 (file)
--- a/gittutorial.txt
+++ b/gittutorial.txt
@@ -598,6 +598,8 @@ SEE ALSO
 --------
 linkgit:gittutorial-2[7],
 linkgit:gitcvs-migration[7],
+linkgit:gitcore-tutorial[7],
+linkgit:gitglossary[7],
 link:everyday.html[Everyday git],
 link:user-manual.html[The Git User's Manual]
 

diff --git a/glossary.txt b/glossary-content.txt
similarity index 98%
rename from glossary.txt
rename to glossary-content.txt
index 51b63532b67870960351bf6942f7baf7a7a64c6f..9b4a4f45e900a96c4ddeb214816877f39cca15a5 100644 (file)
--- a/glossary.txt
+++ b/glossary-content.txt
@@ -1,6 +1,3 @@
-GIT Glossary
-============
-
 [[def_alternate_object_database]]alternate object database::
        Via the alternates mechanism, a <<def_repository,repository>>
        can inherit part of its <<def_object_database,object database>>
@@ -90,11 +87,10 @@ to point at the new commit.
        source code management tools.
 
 [[def_DAG]]DAG::
-       Directed acyclic graph. The <<def_commit,commit>> objects form a
+       Directed acyclic graph. The <<def_commit_object,commit objects>> form a
        directed acyclic graph, because they have parents (directed), and the
-       graph of commit objects is acyclic (there is no
-       <<def_chain,chain>> which begins and ends with the same
-       <<def_object,object>>).
+       graph of commit objects is acyclic (there is no <<def_chain,chain>>
+       which begins and ends with the same <<def_object,object>>).
 
 [[def_dangling_object]]dangling object::
        An <<def_unreachable_object,unreachable object>> which is not
@@ -250,9 +246,10 @@ This commit is referred to as a "merge commit", or sometimes just a
        the <<def_hash,hash>> of the object.
 
 [[def_object_type]]object type::
-       One of the identifiers
-       "<<def_commit,commit>>","<<def_tree,tree>>","<<def_tag,tag>>" or "<<def_blob_object,blob>>"
-       describing the type of an <<def_object,object>>.
+       One of the identifiers "<<def_commit_object,commit>>",
+       "<<def_tree_object,tree>>", "<<def_tag_object,tag>>" or
+       "<<def_blob_object,blob>>" describing the type of an
+       <<def_object,object>>.
 
 [[def_octopus]]octopus::
        To <<def_merge,merge>> more than two <<def_branch,branches>>. Also denotes an

diff --git a/user-manual.html b/user-manual.html
index 9b311aa710e6866e5128de18bb41aee6da6a9810..67ddd65922d61c6ae940f25b633c3e7125359f72 100644 (file)
--- a/user-manual.html
+++ b/user-manual.html
@@ -1949,11 +1949,10 @@ to point at the new commit.</p></dd><dt><span class="term">
 </dd><dt><span class="term">
 <a name="def_DAG"></a>DAG
 </span></dt><dd>
-        Directed acyclic graph. The <a href="#def_commit">commit</a> objects form a
+        Directed acyclic graph. The <a href="#def_commit_object">commit objects</a> form a
         directed acyclic graph, because they have parents (directed), and the
-        graph of commit objects is acyclic (there is no
-        <a href="#def_chain">chain</a> which begins and ends with the same
-        <a href="#def_object">object</a>).
+        graph of commit objects is acyclic (there is no <a href="#def_chain">chain</a>
+        which begins and ends with the same <a href="#def_object">object</a>).
 </dd><dt><span class="term">
 <a name="def_dangling_object"></a>dangling object
 </span></dt><dd>
@@ -2132,9 +2131,10 @@ This commit is referred to as a "merge commit", or sometimes just a
 </dd><dt><span class="term">
 <a name="def_object_type"></a>object type
 </span></dt><dd>
-        One of the identifiers
-        "<a href="#def_commit">commit</a>","<a href="#def_tree">tree</a>","<a href="#def_tag">tag</a>" or "<a href="#def_blob_object">blob</a>"
-        describing the type of an <a href="#def_object">object</a>.
+        One of the identifiers "<a href="#def_commit_object">commit</a>",
+        "<a href="#def_tree_object">tree</a>", "<a href="#def_tag_object">tag</a>" or
+        "<a href="#def_blob_object">blob</a>" describing the type of an
+        <a href="#def_object">object</a>.
 </dd><dt><span class="term">
 <a name="def_octopus"></a>octopus
 </span></dt><dd>

diff --git a/user-manual.txt b/user-manual.txt
index fd8cdb625afbfc8d8921a5e085abe32e05c2da9a..bfde507e0ec9a5aadf71bfb42470b8669369ad56 100644 (file)
--- a/user-manual.txt
+++ b/user-manual.txt
@@ -4252,7 +4252,10 @@ You see, Git is actually the best tool to find out about the source of Git
 itself!
 
 [[glossary]]
-include::glossary.txt[]
+GIT Glossary
+============
+
+include::glossary-content.txt[]
 
 [[git-quick-start]]
 Appendix A: Git Quick Reference