Autogenerated HTML docs for v1.4.1-gff4c8

diff --git a/cvs-migration.html b/cvs-migration.html
index 63e5d1ec9995a018790cbfe03b5b89e6bfc243a7..7958e02840cbf7b9d8c9f69c47de4bc31992fd74 100644 (file)
--- a/cvs-migration.html
+++ b/cvs-migration.html
@@ -357,7 +357,7 @@ easy way to do this is to give all the team members ssh access to the
 machine where the repository is hosted.  If you don't want to give them a\r
 full shell on the machine, there is a restricted shell which only allows\r
 users to do git pushes and pulls; see <a href="git-shell.html">git-shell(1)</a>.</p>\r
-<p>Put all the committers should in the same group, and make the repository\r
+<p>Put all the committers in the same group, and make the repository\r
 writable by that group:</p>\r
 <div class="listingblock">\r
 <div class="content">\r
@@ -579,7 +579,7 @@ that contain this changed "if" statement:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jun-2006 19:51:36 UTC\r
+Last updated 09-Jul-2006 20:38:46 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/cvs-migration.txt b/cvs-migration.txt
index 1fbca83141e20599e4d6edd880b1cabbf0cd9913..d2b0bd38de7fb39ccff5687013784ea8ceb22f1c 100644 (file)
--- a/cvs-migration.txt
+++ b/cvs-migration.txt
@@ -93,7 +93,7 @@ machine where the repository is hosted.  If you don't want to give them a
 full shell on the machine, there is a restricted shell which only allows
 users to do git pushes and pulls; see gitlink:git-shell[1].
 
-Put all the committers should in the same group, and make the repository
+Put all the committers in the same group, and make the repository
 writable by that group:
 
 ------------------------------------------------

diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html
index 70e37cde2b39abeadbfafb1a17ec01340e8bcfb2..6feffb1db638aa3b6f63058c0d4c5a51df16d9c5 100644 (file)
--- a/git-cvsexportcommit.html
+++ b/git-cvsexportcommit.html
@@ -272,7 +272,7 @@ git-cvsexportcommit(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-cvsexportcommmit</em> [-h] [-v] [-c] [-p] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID</p>\r
+<p><em>git-cvsexportcommit</em> [-h] [-v] [-c] [-p] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -377,7 +377,7 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-May-2006 09:22:47 UTC\r
+Last updated 09-Jul-2006 20:38:36 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt
index 56bd3e517d80e6542a3aa118984aee0fefec2ab7..27ac72d98fcf8cf2cd0c0ab236e7646ecff7499d 100644 (file)
--- a/git-cvsexportcommit.txt
+++ b/git-cvsexportcommit.txt
@@ -8,7 +8,7 @@ git-cvsexportcommit - Export a commit to a CVS checkout
 
 SYNOPSIS
 --------
-'git-cvsexportcommmit' [-h] [-v] [-c] [-p] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
+'git-cvsexportcommit' [-h] [-v] [-c] [-p] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
 
 
 DESCRIPTION

diff --git a/git-diff-files.html b/git-diff-files.html
index 44df9c6467a9e617afb487c0bcfc7a61cc8d2397..aa0eb8fe4003c1ace105ea4745bc72cf127375dc 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -539,7 +539,7 @@ omit diff output for unmerged entries and just show "Unmerged".</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Remain silent even on nonexisting files\r
+        Remain silent even on nonexistent files\r
 </p>\r
 </dd>\r
 </dl>\r
@@ -863,7 +863,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 09-Jul-2006 09:37:53 UTC\r
+Last updated 09-Jul-2006 20:38:37 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-files.txt b/git-diff-files.txt
index 481b8b3aa09539ff71a3f48b0b50b75e9ccce7a7..7248b35d952c3fe97496895059af35300694eb98 100644 (file)
--- a/git-diff-files.txt
+++ b/git-diff-files.txt
@@ -37,7 +37,7 @@ omit diff output for unmerged entries and just show "Unmerged".
        commit with these flags.
 
 -q::
-       Remain silent even on nonexisting files
+       Remain silent even on nonexistent files
 
 Output format
 -------------

diff --git a/git-diff.html b/git-diff.html
index 6a4b17527bf20c56e4ddb4246fad6b795755b5bc..64d465cdbc84c12fd54a6dd6faef4a1912139c2c 100644 (file)
--- a/git-diff.html
+++ b/git-diff.html
@@ -272,32 +272,32 @@ git-diff(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-diff</em> [ --diff-options ] &lt;ent&gt;{0,2} [&lt;path&gt;&#8230;]</p>\r
+<p><em>git-diff</em> [ --diff-options ] &lt;tree-ish&gt;{0,2} [&lt;path&gt;&#8230;]</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
-<p>Show changes between two ents, an ent and the working tree, an\r
-ent and the index file, or the index file and the working tree.\r
+<p>Show changes between two trees, a tree and the working tree, a\r
+tree and the index file, or the index file and the working tree.\r
 The combination of what is compared with what is determined by\r
-the number of ents given to the command.</p>\r
+the number of trees given to the command.</p>\r
 <ul>\r
 <li>\r
 <p>\r
-When no &lt;ent&gt; is given, the working tree and the index\r
-  file is compared, using <tt>git-diff-files</tt>.\r
+When no &lt;tree-ish&gt; is given, the working tree and the index\r
+  file are compared, using <tt>git-diff-files</tt>.\r
 </p>\r
 </li>\r
 <li>\r
 <p>\r
-When one &lt;ent&gt; is given, the working tree and the named\r
-  tree is compared, using <tt>git-diff-index</tt>.  The option\r
+When one &lt;tree-ish&gt; is given, the working tree and the named\r
+  tree are compared, using <tt>git-diff-index</tt>.  The option\r
   <tt>--cached</tt> can be given to compare the index file and\r
   the named tree.\r
 </p>\r
 </li>\r
 <li>\r
 <p>\r
-When two &lt;ent&gt;s are given, these two trees are compared\r
+When two &lt;tree-ish&gt;s are given, these two trees are compared\r
   using <tt>git-diff-tree</tt>.\r
 </p>\r
 </li>\r
@@ -463,7 +463,7 @@ output diff in reverse.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Jun-2006 07:24:26 UTC\r
+Last updated 09-Jul-2006 20:38:38 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff.txt b/git-diff.txt
index 7ab20803761b0d5ac69e3b9acc31ed4e9d59ef4c..228c4d95bd41d40bbb32cfcb6b9a7dc648280fa5 100644 (file)
--- a/git-diff.txt
+++ b/git-diff.txt
@@ -8,24 +8,24 @@ git-diff - Show changes between commits, commit and working tree, etc
 
 SYNOPSIS
 --------
-'git-diff' [ --diff-options ] <ent>{0,2} [<path>...]
+'git-diff' [ --diff-options ] <tree-ish>{0,2} [<path>...]
 
 DESCRIPTION
 -----------
-Show changes between two ents, an ent and the working tree, an
-ent and the index file, or the index file and the working tree.
+Show changes between two trees, a tree and the working tree, a
+tree and the index file, or the index file and the working tree.
 The combination of what is compared with what is determined by
-the number of ents given to the command.
+the number of trees given to the command.
 
-* When no <ent> is given, the working tree and the index
-  file is compared, using `git-diff-files`.
+* When no <tree-ish> is given, the working tree and the index
+  file are compared, using `git-diff-files`.
 
-* When one <ent> is given, the working tree and the named
-  tree is compared, using `git-diff-index`.  The option
+* When one <tree-ish> is given, the working tree and the named
+  tree are compared, using `git-diff-index`.  The option
   `--cached` can be given to compare the index file and
   the named tree.
 
-* When two <ent>s are given, these two trees are compared
+* When two <tree-ish>s are given, these two trees are compared
   using `git-diff-tree`.
 
 OPTIONS

diff --git a/git-fetch.html b/git-fetch.html
index cdf4a1e27f5b25e331692c53e90b862c24a52f4e..af2275bf14ea014fa7ae6a1517fc9828360fda2f 100644 (file)
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -565,7 +565,7 @@ Pull: &lt;refspec&gt;</tt></pre>
 &lt;repository&gt; without &lt;refspec&gt; parameters on the command\r
 line, &lt;refspec&gt; specified on <tt>Push:</tt> lines or <tt>Pull:</tt>\r
 lines are used for <tt>git-push</tt> and <tt>git-fetch</tt>/<tt>git-pull</tt>,\r
-respectively.  Multiple <tt>Push:</tt> and and <tt>Pull:</tt> lines may\r
+respectively.  Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may\r
 be specified for additional branch mappings.</p>\r
 <p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be\r
 specified as an older notation short-hand; the named\r
@@ -606,7 +606,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Mar-2006 00:31:25 UTC\r
+Last updated 09-Jul-2006 20:38:38 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-init-db.html b/git-init-db.html
index 67e56214eeae282beef15e65a0f4118fd98fbc2a..c87bbbc7adcd52225320c4123dd62f76a1faffde 100644 (file)
--- a/git-init-db.html
+++ b/git-init-db.html
@@ -300,7 +300,7 @@ git-init-db(1) Manual Page
 <div class="sectionbody">\r
 <p>This command creates an empty git repository - basically a <tt>.git</tt> directory\r
 with subdirectories for <tt>objects</tt>, <tt>refs/heads</tt>, <tt>refs/tags</tt>, and\r
-templated files.\r
+template files.\r
 An initial <tt>HEAD</tt> file that references the HEAD of the master branch\r
 is also created.</p>\r
 <p>If <tt>--template=&lt;template_directory&gt;</tt> is specified, <tt>&lt;template_directory&gt;</tt>\r
@@ -363,7 +363,7 @@ add all existing file to the index
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 29-Apr-2006 07:01:33 UTC\r
+Last updated 09-Jul-2006 20:38:39 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-init-db.txt b/git-init-db.txt
index 8a150d861f5b4c3dc468d46fa09dbfce5be020fc..0a4fc14b97fe690f9546c5d6734dfaaa9d0d656f 100644 (file)
--- a/git-init-db.txt
+++ b/git-init-db.txt
@@ -25,7 +25,7 @@ DESCRIPTION
 -----------
 This command creates an empty git repository - basically a `.git` directory
 with subdirectories for `objects`, `refs/heads`, `refs/tags`, and
-templated files.
+template files.
 An initial `HEAD` file that references the HEAD of the master branch
 is also created.
 

diff --git a/git-mailsplit.html b/git-mailsplit.html
index 3fe71ec46a499a77d1e096f8adff67aef8104384..933264f60791bbb60f333817da585287d498212f 100644 (file)
--- a/git-mailsplit.html
+++ b/git-mailsplit.html
@@ -305,7 +305,7 @@ directory so you can process them further from there.</p>
 <dd>\r
 <p>\r
         If any file doesn't begin with a From line, assume it is a\r
-        single mail message instead of signalling error.\r
+        single mail message instead of signaling error.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -344,7 +344,7 @@ and Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Mar-2006 00:31:29 UTC\r
+Last updated 09-Jul-2006 20:38:39 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mailsplit.txt b/git-mailsplit.txt
index 209e36bacb03c166e1c0c61e8c6e14447cd44f6a..5a17801f6a8d4d307f55e62745a400ad498ebdb9 100644 (file)
--- a/git-mailsplit.txt
+++ b/git-mailsplit.txt
@@ -25,7 +25,7 @@ OPTIONS
 
 -b::
        If any file doesn't begin with a From line, assume it is a
-       single mail message instead of signalling error.
+       single mail message instead of signaling error.
 
 -d<prec>::
        Instead of the default 4 digits with leading zeros,

diff --git a/git-merge.html b/git-merge.html
index 45a341fa81f56ad63d76d91e44883b3f4d33b020..6e39fe6eac742442b8a0061904b739dec406bfca 100644 (file)
--- a/git-merge.html
+++ b/git-merge.html
@@ -459,7 +459,7 @@ what it means for a path to "interfere with the merge".  And if
 your local modifications interfere with the merge, again, it\r
 stops before touching anything.</p>\r
 <p>So in the above two "failed merge" case, you do not have to\r
-worry about lossage of data --- you simply were not ready to do\r
+worry about loss of data --- you simply were not ready to do\r
 a merge, so no merge happened at all.  You may want to finish\r
 whatever you were in the middle of doing, and retry the same\r
 pull after you are done and ready.</p>\r
@@ -567,7 +567,7 @@ Resolve the conflicts.  <tt>git-diff</tt> would report only the
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Jun-2006 23:46:45 UTC\r
+Last updated 09-Jul-2006 20:38:39 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge.txt b/git-merge.txt
index 4ce799b520b501b1ea6dddd5643bf3aec2aca344..bebf30ad3db951c0a0bad01ebee619821781eb39 100644 (file)
--- a/git-merge.txt
+++ b/git-merge.txt
@@ -83,7 +83,7 @@ your local modifications interfere with the merge, again, it
 stops before touching anything.
 
 So in the above two "failed merge" case, you do not have to
-worry about lossage of data --- you simply were not ready to do
+worry about loss of data --- you simply were not ready to do
 a merge, so no merge happened at all.  You may want to finish
 whatever you were in the middle of doing, and retry the same
 pull after you are done and ready.

diff --git a/git-p4import.html b/git-p4import.html
index dac9a2c758ef7b8f9a5cbe69c74986ca0f48099c..85afe6c02f058fdf70f2b56a3bfc756f17ed6c52 100644 (file)
--- a/git-p4import.html
+++ b/git-p4import.html
@@ -427,7 +427,7 @@ one per "view" instead of listing the actual directory.</p>
 <p>A git tag of the form p4/xx is created for every change imported from\r
 the Perforce repository where xx is the Perforce changeset number.\r
 Therefore after the import you can use git to access any commit by its\r
-Perforce number, eg. git show p4/327.</p>\r
+Perforce number, e.g. git show p4/327.</p>\r
 <p>The tag associated with the HEAD commit is also how <tt>git-p4import</tt>\r
 determines if there are new changes to incrementally import from the\r
 Perforce repository.</p>\r
@@ -439,7 +439,7 @@ may delete the tags.</p>
 </div>\r
 <h2>Notes</h2>\r
 <div class="sectionbody">\r
-<p>You can interrupt the import (eg. ctrl-c) at any time and restart it\r
+<p>You can interrupt the import (e.g. ctrl-c) at any time and restart it\r
 without worry.</p>\r
 <p>Author information is automatically determined by querying the\r
 Perforce "users" table using the id associated with each change.\r
@@ -461,7 +461,7 @@ of mappings with each line containing one mapping in the format:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 18-Jun-2006 00:21:51 UTC\r
+Last updated 09-Jul-2006 20:38:40 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-p4import.txt b/git-p4import.txt
index 0858e5efbe01a8e47ddcfa9b1c7e1c6169f9b7e1..ee9e8fa9090f88d1eb45ddbdb73866e0dc1fd53d 100644 (file)
--- a/git-p4import.txt
+++ b/git-p4import.txt
@@ -128,7 +128,7 @@ Tags
 A git tag of the form p4/xx is created for every change imported from
 the Perforce repository where xx is the Perforce changeset number.
 Therefore after the import you can use git to access any commit by its
-Perforce number, eg. git show p4/327.
+Perforce number, e.g. git show p4/327.
 
 The tag associated with the HEAD commit is also how `git-p4import`
 determines if there are new changes to incrementally import from the
@@ -143,7 +143,7 @@ may delete the tags.
 
 Notes
 -----
-You can interrupt the import (eg. ctrl-c) at any time and restart it
+You can interrupt the import (e.g. ctrl-c) at any time and restart it
 without worry.
 
 Author information is automatically determined by querying the

diff --git a/git-pack-redundant.html b/git-pack-redundant.html
index c9ea3364b9383fff40790634fbef6fb0c1345f09..a32b9848a0959e568c44be5a9fde4455bf1a2d54 100644 (file)
--- a/git-pack-redundant.html
+++ b/git-pack-redundant.html
@@ -293,7 +293,7 @@ objects.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Processes all packs. Any filenames on the commandline are ignored.\r
+        Processes all packs. Any filenames on the command line are ignored.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -335,7 +335,7 @@ objects.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Mar-2006 00:31:30 UTC\r
+Last updated 09-Jul-2006 20:38:40 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pack-redundant.txt b/git-pack-redundant.txt
index 8fb065943862e55c6cc0b3c7408506d06ad510f4..7d54b17e37b1065444b9ce100013e4a505af218d 100644 (file)
--- a/git-pack-redundant.txt
+++ b/git-pack-redundant.txt
@@ -29,7 +29,7 @@ OPTIONS
 
 
 --all::
-       Processes all packs. Any filenames on the commandline are ignored.
+       Processes all packs. Any filenames on the command line are ignored.
 
 --alt-odb::
        Don't require objects present in packs from alternate object

diff --git a/git-pull.html b/git-pull.html
index 4f99c57f8a9a5b71681bdbc824c0253c8236c05e..edff642ffc555574b9edf4c9ac7ff7a7956e53ac 100644 (file)
--- a/git-pull.html
+++ b/git-pull.html
@@ -609,7 +609,7 @@ Pull: &lt;refspec&gt;</tt></pre>
 &lt;repository&gt; without &lt;refspec&gt; parameters on the command\r
 line, &lt;refspec&gt; specified on <tt>Push:</tt> lines or <tt>Pull:</tt>\r
 lines are used for <tt>git-push</tt> and <tt>git-fetch</tt>/<tt>git-pull</tt>,\r
-respectively.  Multiple <tt>Push:</tt> and and <tt>Pull:</tt> lines may\r
+respectively.  Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may\r
 be specified for additional branch mappings.</p>\r
 <p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be\r
 specified as an older notation short-hand; the named\r
@@ -808,7 +808,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Jun-2006 23:46:45 UTC\r
+Last updated 09-Jul-2006 20:38:41 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-push.html b/git-push.html
index 68be21fc5bd88b518d0be6eb7b0307ee3fcc744c..ca710d34c9bc8a3c9243efba8b24deef88f184c7 100644 (file)
--- a/git-push.html
+++ b/git-push.html
@@ -358,7 +358,7 @@ A parameter <ref> without a colon is equivalent to
 <dd>\r
 <p>\r
         Usually, the command refuses to update a remote ref that is\r
-        not a descendent of the local ref used to overwrite it.\r
+        not a descendant of the local ref used to overwrite it.\r
         This flag disables the check.  This can cause the\r
         remote repository to lose commits; use it with care.\r
 </p>\r
@@ -465,7 +465,7 @@ Pull: &lt;refspec&gt;</tt></pre>
 &lt;repository&gt; without &lt;refspec&gt; parameters on the command\r
 line, &lt;refspec&gt; specified on <tt>Push:</tt> lines or <tt>Pull:</tt>\r
 lines are used for <tt>git-push</tt> and <tt>git-fetch</tt>/<tt>git-pull</tt>,\r
-respectively.  Multiple <tt>Push:</tt> and and <tt>Pull:</tt> lines may\r
+respectively.  Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may\r
 be specified for additional branch mappings.</p>\r
 <p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be\r
 specified as an older notation short-hand; the named\r
@@ -501,7 +501,7 @@ Pull: refs/heads/&lt;head&gt;:&lt;remote&gt;</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Mar-2006 00:31:32 UTC\r
+Last updated 09-Jul-2006 20:38:41 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-push.txt b/git-push.txt
index d5b5ca167ccf3fcfaeb818a305ca79b37dcd7bf8..56afd64f42784457d73463ab9bea196264a3296b 100644 (file)
--- a/git-push.txt
+++ b/git-push.txt
@@ -67,7 +67,7 @@ Some short-cut notations are also supported.
 
 -f, \--force::
        Usually, the command refuses to update a remote ref that is
-       not a descendent of the local ref used to overwrite it.
+       not a descendant of the local ref used to overwrite it.
        This flag disables the check.  This can cause the
        remote repository to lose commits; use it with care.
 

diff --git a/git-repo-config.html b/git-repo-config.html
index e0b125ecfd6a522ff80105beaa15a3e0e5f74ea1..174f68b1bca48513868fca139255b7943933ad50 100644 (file)
--- a/git-repo-config.html
+++ b/git-repo-config.html
@@ -456,8 +456,8 @@ GIT_CONFIG_LOCAL
 <div class="content">\r
 <pre><tt>% git repo-config core.filemode true</tt></pre>\r
 </div></div>\r
-<p>The hypothetic proxy command entries actually have a postfix to discern\r
-to what URL they apply. Here is how to change the entry for kernel.org\r
+<p>The hypothetical proxy command entries actually have a postfix to discern\r
+what URL they apply to. Here is how to change the entry for kernel.org\r
 to "ssh".</p>\r
 <div class="listingblock">\r
 <div class="content">\r
@@ -888,7 +888,7 @@ imap
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jul-2006 02:03:32 UTC\r
+Last updated 09-Jul-2006 20:38:42 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-repo-config.txt b/git-repo-config.txt
index 803c0d5cae6db0a953380adc6ee3980a0afa72e0..b03d66f61ca4b234e721d671cc2521182a8e12b1 100644 (file)
--- a/git-repo-config.txt
+++ b/git-repo-config.txt
@@ -119,8 +119,8 @@ you can set the filemode to true with
 % git repo-config core.filemode true
 ------------
 
-The hypothetic proxy command entries actually have a postfix to discern
-to what URL they apply. Here is how to change the entry for kernel.org
+The hypothetical proxy command entries actually have a postfix to discern
+what URL they apply to. Here is how to change the entry for kernel.org
 to "ssh".
 
 ------------

diff --git a/git-rev-list.html b/git-rev-list.html
index 21a1b174781dbed09601c0dd82b127a872494885..21dc6bf1c6cb65a3e9653a27e164db263d0ee65e 100644 (file)
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -345,7 +345,7 @@ $ git-rev-list A...B</tt></pre>
 <dd>\r
 <p>\r
         Similar to <tt>--objects</tt>, but also print the IDs of\r
-        excluded commits refixed with a <tt>-</tt> character.  This is\r
+        excluded commits prefixed with a <tt>-</tt> character.  This is\r
         used by <tt>git-pack-objects</tt> to build <em>thin</em> pack, which\r
         records objects in deltified form based on objects\r
         contained in these excluded commits to reduce network\r
@@ -460,7 +460,7 @@ $ git-rev-list A...B</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jul-2006 06:05:13 UTC\r
+Last updated 09-Jul-2006 20:38:43 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.txt b/git-rev-list.txt
index 6c370e1bef9a83cd756146f6a3739abb4d08b4ed..e220842981627d659a0a9b91a0778b0ef469c2af 100644 (file)
--- a/git-rev-list.txt
+++ b/git-rev-list.txt
@@ -64,7 +64,7 @@ OPTIONS
 
 --objects-edge::
        Similar to `--objects`, but also print the IDs of
-       excluded commits refixed with a `-` character.  This is
+       excluded commits prefixed with a `-` character.  This is
        used by `git-pack-objects` to build 'thin' pack, which
        records objects in deltified form based on objects
        contained in these excluded commits to reduce network

diff --git a/git-tools.html b/git-tools.html
index 4c458dbac153a5c24da98723d1d0f8ee16333592..5088b6d13abc70e2b1b24bf4721dab1a4706b908 100644 (file)
--- a/git-tools.html
+++ b/git-tools.html
@@ -316,7 +316,7 @@ until they get merged upstream.</tt></pre>
 </p>\r
 <div class="literalblock">\r
 <div class="content">\r
-<pre><tt>gitk is a simple TK GUI for browsing history of GIT repositories easily.</tt></pre>\r
+<pre><tt>gitk is a simple Tk GUI for browsing history of GIT repositories easily.</tt></pre>\r
 </div></div>\r
 </li>\r
 <li>\r
@@ -407,7 +407,7 @@ tweaking to work on XEmacs.</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Jun-2006 07:24:40 UTC\r
+Last updated 09-Jul-2006 20:38:47 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-tools.txt b/git-tools.txt
index d79523f56d063aa4a3ee3181fa224694c7970613..0914cbb0ba528653aa50c6a2eb27815bd69d3508 100644 (file)
--- a/git-tools.txt
+++ b/git-tools.txt
@@ -42,7 +42,7 @@ History Viewers
 
    - *gitk* (shipped with git-core)
 
-   gitk is a simple TK GUI for browsing history of GIT repositories easily.
+   gitk is a simple Tk GUI for browsing history of GIT repositories easily.
 
 
    - *gitview*  (contrib/)

diff --git a/git-upload-tar.html b/git-upload-tar.html
index 7d51d26f1843a086ceab38993b792243660bb4e4..4ccefc06f9819ab62c1d53559d61284196c17538 100644 (file)
--- a/git-upload-tar.html
+++ b/git-upload-tar.html
@@ -280,7 +280,7 @@ git-upload-tar(1) Manual Page
 to the other end over the git protocol.</p>\r
 <p>This command is usually not invoked directly by the end user.\r
 The UI for the protocol is on the <em>git-tar-tree</em> side, and the\r
-program pair is meant to be used to get a tar achive from a\r
+program pair is meant to be used to get a tar archive from a\r
 remote repository.</p>\r
 </div>\r
 <h2>OPTIONS</h2>\r
@@ -310,7 +310,7 @@ remote repository.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jun-2006 19:51:33 UTC\r
+Last updated 09-Jul-2006 20:38:43 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-upload-tar.txt b/git-upload-tar.txt
index a1019a0231fdc36ca5f70b712415114b6cfa6bdb..394af62015590551f313378edcc0d03bfa13802c 100644 (file)
--- a/git-upload-tar.txt
+++ b/git-upload-tar.txt
@@ -17,7 +17,7 @@ to the other end over the git protocol.
 
 This command is usually not invoked directly by the end user.
 The UI for the protocol is on the 'git-tar-tree' side, and the
-program pair is meant to be used to get a tar achive from a
+program pair is meant to be used to get a tar archive from a
 remote repository.
 
 

diff --git a/git.html b/git.html
index ec9f7487582dec1c79a001b57dedb095963e797d..f23bdf6da6cd966a41a01d7d5b8046bf2e0f2942 100644 (file)
--- a/git.html
+++ b/git.html
@@ -1325,7 +1325,7 @@ ancillary user utilities.</p>
 <div class="sectionbody">\r
 <p>Starting from 0.99.9 (actually mid 0.99.8.GIT), <tt>.git/config</tt> file\r
 is used to hold per-repository configuration options.  It is a\r
-simple text file modelled after <tt>.ini</tt> format familiar to some\r
+simple text file modeled after <tt>.ini</tt> format familiar to some\r
 people.  Here is an example:</p>\r
 <div class="listingblock">\r
 <div class="content">\r
@@ -2105,7 +2105,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 22-Jun-2006 19:49:27 UTC\r
+Last updated 09-Jul-2006 20:38:44 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index 51f20c6e67acb8c7eb526fac544992eaec321623..d00cc3ea5219f73aac79709e683e135548555fd3 100644 (file)
--- a/git.txt
+++ b/git.txt
@@ -478,7 +478,7 @@ Configuration Mechanism
 
 Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file
 is used to hold per-repository configuration options.  It is a
-simple text file modelled after `.ini` format familiar to some
+simple text file modeled after `.ini` format familiar to some
 people.  Here is an example:
 
 ------------

diff --git a/glossary.html b/glossary.html
index 303893e0e78485ff3260ff4ada75787401e774ea..ac629502a6d6e0e41edaae82c402548e578a9eb1 100644 (file)
--- a/glossary.html
+++ b/glossary.html
@@ -448,7 +448,7 @@ div.exampleblock-content {
 <p>\r
         Favorite synonym to "<a href="#ref_tree-ish">tree-ish</a>" by some total geeks. See\r
         <tt>http://en.wikipedia.org/wiki/Ent_(Middle-earth)</tt> for an in-depth\r
-        explanation.\r
+        explanation. Avoid this term, not to confuse people.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -950,7 +950,7 @@ the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jun-2006 19:51:37 UTC\r
+Last updated 09-Jul-2006 20:38:48 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/glossary.txt b/glossary.txt
index 116ddb7fbfd7654bb7330e8f56dd03a9be029cd1..14449ca8baeb7c2c979d0fd3f61ce683fd8e08ce 100644 (file)
--- a/glossary.txt
+++ b/glossary.txt
@@ -86,7 +86,7 @@ directory::
 ent::
        Favorite synonym to "tree-ish" by some total geeks. See
        `http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth
-       explanation.
+       explanation.  Avoid this term, not to confuse people.
 
 fast forward::
        A fast-forward is a special type of merge where you have

diff --git a/howto-index.html b/howto-index.html
index 77ecab28838da3d182df49cbbf67377a71f11059..9a5fe7b6a069baef8e0cea8cfa87aaa625a7a87b 100644 (file)
--- a/howto-index.html
+++ b/howto-index.html
@@ -360,7 +360,7 @@ as a Linux subsystem maintainer.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Feb-2006 13:31:35 UTC\r
+Last updated 09-Jul-2006 20:38:47 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/howto/isolate-bugs-with-bisect.txt b/howto/isolate-bugs-with-bisect.txt
index edbcd4c6618d6f9c123c49d4835dfc59b74e07f5..926bbdc3cb1dcab81e0d90de3a0b9b87153e55e6 100644 (file)
--- a/howto/isolate-bugs-with-bisect.txt
+++ b/howto/isolate-bugs-with-bisect.txt
@@ -28,7 +28,7 @@ Then do
 
 and at this point "git bisect" will churn for a while, and tell you what 
 the mid-point between those two commits are, and check that state out as 
-the head of the bew "bisect" branch.
+the head of the new "bisect" branch.
 
 Compile and reboot.
 

diff --git a/howto/rebase-from-internal-branch.txt b/howto/rebase-from-internal-branch.txt
index c2d4a91c7cf0a631ffd3caadea8a6aa25aa4a24c..fcd64e9b9b6d53b46d31e0c797016e9881651604 100644 (file)
--- a/howto/rebase-from-internal-branch.txt
+++ b/howto/rebase-from-internal-branch.txt
@@ -124,7 +124,7 @@ up your changes, along with other changes.
 
 The two commits #2' and #3' in the above picture record the same
 changes your e-mail submission for #2 and #3 contained, but
-probably with the new sign-off line added by the upsteam
+probably with the new sign-off line added by the upstream
 maintainer and definitely with different committer and ancestry
 information, they are different objects from #2 and #3 commits.
 

diff --git a/urls.txt b/urls.txt
index 74774134e3939cf1f5447d3aaec319994504ce1b..d60b37147a562ead9cadf3856878728443fa2dce 100644 (file)
--- a/urls.txt
+++ b/urls.txt
@@ -47,7 +47,7 @@ Then such a short-hand is specified in place of
 <repository> without <refspec> parameters on the command
 line, <refspec> specified on `Push:` lines or `Pull:`
 lines are used for `git-push` and `git-fetch`/`git-pull`,
-respectively.  Multiple `Push:` and and `Pull:` lines may
+respectively.  Multiple `Push:` and `Pull:` lines may
 be specified for additional branch mappings.
 
 The name of a file in `$GIT_DIR/branches` directory can be