Link howto documents from the main git.txt documentation.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index d13325063520ca005765a4769c71321950b5dd8a..d4ede094f865873b1661cfea8a8af879e4ce2a05 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -24,6 +24,11 @@ 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
 
@@ -208,7 +213,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]::
@@ -240,9 +254,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
 
@@ -316,9 +327,6 @@ link:git-get-tar-commit-id.html[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.