Merge refs/heads/master from .

[git.git] / Documentation / git.txt

diff --git a/Documentation/git.txt b/Documentation/git.txt
index be26614..664b88a 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -16,6 +16,9 @@ DESCRIPTION
 
 This is reference information for the core git commands.
 
+Before reading this cover to cover, you may want to take a look
+at the link:tutorial.html[tutorial] document.
+
 The Discussion section below contains much useful definition and
 clarification info - read that first.  And of the commands, I suggest
 reading link:git-update-cache.html[git-update-cache] and
@@ -205,10 +208,19 @@ link:git-fetch-script.html[git-fetch-script]::
 link:git-pull-script.html[git-pull-script]::
        Fetch from and merge with a remote repository.
 
+link:git-resolve-script.html[git-resolve-script]::
+       Merge two commits.
+
+link:git-octopus-script.html[git-octopus-script]::
+       Merge more than two commits.
+
+link:git-push-script.html[git-push-script]::
+       Update remote refs along with associated objects.
+
 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.
 
 link:git-repack-script.html[git-repack-script]::
@@ -237,9 +249,6 @@ link:git-merge-one-file-script.html[git-merge-one-file-script]::
 link:git-prune-script.html[git-prune-script]::
        Prunes all unreachable objects from the object database
 
-link:git-resolve-script.html[git-resolve-script]::
-       Script used to merge two trees
-
 link:git-tag-script.html[git-tag-script]::
        An example script to create a tag object signed with GPG
 
@@ -259,6 +268,94 @@ link:git-send-email-script.html[git-send-email]::
        Send patch e-mails out of "format-patch --mbox" output.
 
 
+Commands not yet documented
+---------------------------
+
+link:git-applymbox.html[git-applymbox]::
+       git-applymbox.
+
+link:git-applypatch.html[git-applypatch]::
+       git-applypatch.
+
+link:git-mailinfo.html[git-mailinfo]::
+       git-mailinfo.
+
+link:git-mailsplit.html[git-mailsplit]::
+       git-mailsplit.
+
+link:git-add-script.html[git-add-script]::
+       git-add-script.
+
+link:git-bisect-script.html[git-bisect-script]::
+       git-bisect-script.
+
+link:git-branch-script.html[git-branch-script]::
+       git-branch-script.
+
+link:git-build-rev-cache.html[git-build-rev-cache]::
+       git-build-rev-cache.
+
+link:git-checkout-script.html[git-checkout-script]::
+       git-checkout-script.
+
+link:git-cherry.html[git-cherry]::
+       git-cherry.
+
+link:git-clone-dumb-http.html[git-clone-dumb-http]::
+       git-clone-dumb-http.
+
+link:git-count-objects-script.html[git-count-objects-script]::
+       git-count-objects-script.
+
+link:git-daemon.html[git-daemon]::
+       git-daemon.
+
+link:git-diff-script.html[git-diff-script]::
+       git-diff-script.
+
+link:git-format-patch-script.html[git-format-patch-script]::
+       git-format-patch-script.
+
+link:git-get-tar-commit-id.html[git-get-tar-commit-id]::
+       git-get-tar-commit-id.
+
+link:git-patch-id.html[git-patch-id]::
+       git-patch-id.
+
+link:git-rebase-script.html[git-rebase-script]::
+       git-rebase-script.
+
+link:git-relink-script.html[git-relink-script]::
+       git-relink-script.
+
+link:git-request-pull-script.html[git-request-pull-script]::
+       git-request-pull-script.
+
+link:git-reset-script.html[git-reset-script]::
+       git-reset-script.
+
+link:git-rev-parse.html[git-rev-parse]::
+       git-rev-parse.
+
+link:git-revert-script.html[git-revert-script]::
+       git-revert-script.
+
+link:git-sh-setup-script.html[git-sh-setup-script]::
+       git-sh-setup-script.
+
+link:git-show-rev-cache.html[git-show-rev-cache]::
+       git-show-rev-cache.
+
+link:git-stripspace.html[git-stripspace]::
+       git-stripspace.
+
+link:git-verify-tag-script.html[git-verify-tag-script]::
+       git-verify-tag-script.
+
+link:gitk.html[gitk]::
+       gitk.
+
+
 Identifier Terminology
 ----------------------
 <object>::
@@ -328,12 +425,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