git-apply: creatign empty files is nonfatal

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 134afffe3f669f5806a03793f1d703895b022e0f..971012bf830c23cd9267da881cc2d08ad4468260 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -1,6 +1,6 @@
-git(1)
+git(7)
 ======
-v0.1, May 2005
+May 2005
 
 NAME
 ----
@@ -16,9 +16,10 @@ DESCRIPTION
 
 This is reference information for the core git commands.
 
-The link:README[] contains much useful definition and clarification
-info - read that first.  And of the commands, I suggest reading
-'git-update-cache' and 'git-read-tree' first - I wish I had!
+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!
 
 David Greaves <david@dgreaves.com>
 08/05/05
@@ -50,6 +51,9 @@ 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
 
@@ -144,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:
@@ -152,19 +156,15 @@ 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
 
 
 
-Terminology
------------
-see README for description
-
-Identifier terminology
+Identifier Terminology
 ----------------------
 <object>::
-       Indicates any object sha1 identifier
+       Indicates the sha1 identifier for any type of object
 
 <blob>::
        Indicates a blob object sha1 identifier
@@ -176,11 +176,10 @@ Identifier terminology
        Indicates a commit object sha1 identifier
 
 <tree-ish>::
-       Indicates a tree, commit or tag object sha1 identifier.
-       A command that takes a <tree-ish> argument ultimately
-       wants to operate on a <tree> object but automatically
-       dereferences <commit> and <tag> that points at a
-       <tree>.
+       Indicates a tree, commit or tag object sha1 identifier.  A
+       command that takes a <tree-ish> argument ultimately wants to
+       operate on a <tree> object but automatically dereferences
+       <commit> and <tag> objects that point at a <tree>.
 
 <type>::
        Indicates that an object type is required.
@@ -192,10 +191,12 @@ Identifier terminology
 
 Symbolic Identifiers
 --------------------
-Any git comand accepting any <object> can also use the following symbolic notation:
+Any git comand accepting any <object> can also use the following
+symbolic notation:
 
 HEAD::
-       indicates the head of the repository (ie the contents of `$GIT_DIR/HEAD`)
+       indicates the head of the repository (ie the contents of
+       `$GIT_DIR/HEAD`)
 <tag>::
        a valid tag 'name'+
        (ie the contents of `$GIT_DIR/refs/tags/<tag>`)
@@ -230,18 +231,12 @@ GIT_DIR.
 
 Terminology
 -----------
-Each line contains terms used interchangeably
+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
- blob, blob object
- tree, tree object
- commit, commit object
- parent
- root object
- changeset
 
 
 Environment Variables
@@ -295,9 +290,13 @@ git Diffs
        link:git-diff-files.html[git-diff-files];
        link:git-diff-tree.html[git-diff-tree]
 
+Discussion
+----------
+include::../README[]
+
 Author
 ------
-Written by Linus Torvalds <torvalds@osdl.org>
+Written by Linus Torvalds <torvalds@osdl.org> and the git-list <git@vger.kernel.org>.
 
 Documentation
 --------------