X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit.txt;h=9d4fccdd47079144c67639cd460885eeefb55d68;hb=89305da8a230e435109cc97ed88241c158813523;hp=8d7209bdfcbfdb8db04d4a6b5194d773b54d206a;hpb=7c27558c6236225b07c5d5def76299d2b5fe7635;p=git.git

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 8d7209bd..9d4fccdd 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -38,7 +38,7 @@ In addition, git itself comes with a spartan set of porcelain
 commands.  They are usable but are not meant to compete with real
 Porcelains.
 
-There are also some ancilliary programs that can be viewed as useful
+There are also some ancillary programs that can be viewed as useful
 aids for using the core commands but which are unlikely to be used by
 SCMs layered over git.
 
@@ -71,6 +71,20 @@ link:git-hash-object.html[git-hash-object]::
 link:git-write-tree.html[git-write-tree]::
 	Creates a tree from the current cache
 
+link:git-pack-objects.html[git-pack-objects]::
+	Creates a packed archive of objects.
+
+link:git-unpack-objects.html[git-unpack-objects]::
+	Unpacks objects out of a packed archive.
+
+link:git-prune-packed.html[git-prune-packed]::
+	Remove extra objects that are already in pack files.
+
+link:git-apply.html[git-apply]::
+	Reads a "diff -up1" or git generated patch file and
+	applies it to the working tree.
+
+
 Interrogation commands
 ~~~~~~~~~~~~~~~~~~~~~~
 link:git-cat-file.html[git-cat-file]::
@@ -85,6 +99,9 @@ link:git-diff-files.html[git-diff-files]::
 link:git-diff-tree.html[git-diff-tree]::
 	Compares the content and mode of blobs found via two tree objects
 
+link:git-diff-stages.html[git-diff-stages]::
+	Compares two "merge stages" in the index file.
+
 link:git-export.html[git-export]::
 	Exports each commit and a diff against each of its parents
 
@@ -115,6 +132,9 @@ link:git-unpack-file.html[git-unpack-file]::
 link:git-var.html[git-var]::
 	Displays a git logical variable
 
+link:git-show-index.html[git-show-index]::
+	Displays contents of a pack idx file.
+
 link:git-verify-pack.html[git-verify-pack]::
 	Validates packed GIT archive files
 
@@ -188,11 +208,21 @@ link:git-pull-script.html[git-pull-script]::
 link:git-commit-script.html[git-commit-script]::
 	Record changes to the repository.
 
-link:git-show-branches-script.html[git-show-branches-script]::
+link:git-show-branch.html[git-show-branch]::
 	Show branches and their commits.
 
-Ancilliary Commands
--------------------
+link:git-repack-script.html[git-repack-script]::
+	Pack unpacked objects in a repository.
+
+link:git-rename-script.html[git-rename]::
+	Rename files and directories.
+
+link:git-ls-remote-script.html[git-ls-remote-script]::
+	Shows references in a remote or local repository.
+
+
+Ancillary Commands
+------------------
 Manipulators:
 
 link:git-apply-patch-script.html[git-apply-patch-script]::
@@ -213,8 +243,11 @@ link:git-resolve-script.html[git-resolve-script]::
 link:git-tag-script.html[git-tag-script]::
 	An example script to create a tag object signed with GPG
 
+link:git-cvsimport-script.html[git-cvsimport-script]::
+	Salvage your data out of another SCM people love to hate.
+
 
-Interogators:
+Interrogators:
 
 link:git-diff-helper.html[git-diff-helper]::
 	Generates patch format output for git-diff-*
@@ -222,6 +255,8 @@ link:git-diff-helper.html[git-diff-helper]::
 link:git-ssh-push.html[git-ssh-push]::
 	Helper "server-side" program used by git-ssh-pull
 
+link:git-send-email-script.html[git-send-email]::
+	Send patch e-mails out of "format-patch --mbox" output.
 
 
 Identifier Terminology
@@ -254,7 +289,7 @@ Identifier Terminology
 
 Symbolic Identifiers
 --------------------
-Any git comand accepting any <object> can also use the following
+Any git command accepting any <object> can also use the following
 symbolic notation:
 
 HEAD::
@@ -293,12 +328,7 @@ GIT_DIR.
 
 Terminology
 -----------
-Each line contains terms which you may see used interchangeably
-
- object database, .git directory
- directory cache, index
- id, sha1, sha1-id, sha1 hash
- type, tag
+Please see link:glossary.html[glossary] document.
 
 
 Environment Variables
@@ -325,7 +355,7 @@ git so take care if using Cogito etc
 'GIT_ALTERNATE_OBJECT_DIRECTORIES'::
 	Due to the immutable nature of git objects, old objects can be
 	archived into shared, read-only directories. This variable
-	specifies a ":" seperated list of git object directories which
+	specifies a ":" separated list of git object directories which
 	can be used to search for git objects. New objects will not be
 	written to these directories.