Merge refs/heads/master from .

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 55d63d9432673878268ae9be4ba973b12a384b70..f63cbdd3727237b02c5be5b6f164dcae1fefd2f6 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -1,6 +1,6 @@
 git(7)
 ======
-v0.99.4, Aug 2005
+v0.99.5, Aug 2005
 
 NAME
 ----
@@ -16,11 +16,19 @@ 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
 link:git-read-tree.html[git-read-tree] first - I wish I had!
 
+After you get the general feel from the tutorial and this
+overview page, you may want to take a look at the
+link:howto-index.html[howto] documents.
+
+
 David Greaves <david@dgreaves.com>
 08/05/05
 
@@ -187,6 +195,18 @@ link:git-update-server-info.html[git-update-server-info]::
 
 Porcelain-ish Commands
 ----------------------
+link:git-revert-script.html[git-revert-script]::
+       Revert an existing commit.
+
+link:git-rebase-script.html[git-rebase-script]::
+       Rebase local commits to new upstream head.
+
+link:git-add-script.html[git-add-script]::
+       Add paths to the index file.
+
+link:git-branch-script.html[git-branch-script]::
+       Create and Show branches.
+
 link:git-whatchanged.html[git-whatchanged]::
        Shows commit logs and differences they introduce.
 
@@ -205,7 +225,16 @@ link:git-fetch-script.html[git-fetch-script]::
 link:git-pull-script.html[git-pull-script]::
        Fetch from and merge with a remote repository.
 
-ulink:git-commit-script.html[git-commit-script]::
+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-branch.html[git-show-branch]::
@@ -220,11 +249,17 @@ link:git-rename-script.html[git-rename]::
 link:git-ls-remote-script.html[git-ls-remote-script]::
        Shows references in a remote or local repository.
 
+link:git-verify-tag-script.html[git-verify-tag-script]::
+       Check the GPG signature of tag.
+
 
 Ancillary Commands
 ------------------
 Manipulators:
 
+link:git-relink-script.html[git-relink-script]::
+       Hardlink common objects in local repositories.
+
 link:git-apply-patch-script.html[git-apply-patch-script]::
        Sample script to apply the diffs from git-diff-*
 
@@ -237,9 +272,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
 
@@ -249,6 +281,15 @@ link:git-cvsimport-script.html[git-cvsimport-script]::
 
 Interrogators:
 
+link:git-patch-id.html[git-patch-id]::
+       Compute unique ID for a patch.
+
+link:git-count-objects-script.html[git-count-objects-script]::
+       Count unpacked number of objects and their disk consumption.
+
+link:git-cherry.html[git-cherry]::
+       Find commits not merged upstream.
+
 link:git-diff-helper.html[git-diff-helper]::
        Generates patch format output for git-diff-*
 
@@ -258,6 +299,9 @@ link:git-ssh-push.html[git-ssh-push]::
 link:git-send-email-script.html[git-send-email]::
        Send patch e-mails out of "format-patch --mbox" output.
 
+link:git-sh-setup-script.html[git-sh-setup-script]::
+       Common git shell script setup code.
+
 
 Commands not yet documented
 ---------------------------
@@ -274,30 +318,18 @@ link:git-mailinfo.html[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.
 
@@ -310,18 +342,6 @@ link:git-format-patch-script.html[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-push-script.html[git-push-script]::
-       git-push-script.
-
-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.
 
@@ -331,21 +351,12 @@ link:git-reset-script.html[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.