Merge with Linus' current tree

[git.git] / Documentation / git.txt

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 7edbcc3..797eb33 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -51,9 +51,6 @@ link:git-init-db.html[git-init-db]::
 link:git-merge-base.html[git-merge-base]::
        Finds as good a common ancestor as possible for a merge
 
-link:git-mkdelta.html[git-mkdelta]::
-       Creates a delta object
-
 link:git-mktag.html[git-mktag]::
        Creates a tag object
 
@@ -113,6 +110,9 @@ link:git-tar-tree.html[git-tar-tree]::
 link:git-unpack-file.html[git-unpack-file]::
        Creates a temporary file with a blob's contents
 
+link:git-verify-pack.html[git-verify-pack]::
+       Validates packed GIT archive files
+
 The interrogate commands may create files - and you can force them to
 touch the working file set - but in general they don't
 
@@ -148,7 +148,7 @@ 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-rpull.html[git-rpull]::
+link:git-ssh-pull.html[git-ssh-pull]::
        Pulls from a remote repository over ssh connection
 
 Interogators:
@@ -156,8 +156,8 @@ Interogators:
 link:git-diff-helper.html[git-diff-helper]::
        Generates patch format output for git-diff-*
 
-link:git-rpush.html[git-rpush]::
-       Helper "server-side" program used by git-rpull
+link:git-ssh-push.html[git-ssh-push]::
+       Helper "server-side" program used by git-ssh-pull