user-manual: point to README for gitweb information

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 4ce4f8d1c6efd18088c046a682ef66d6ae067bdc..f89d745efa73a9e22537aadb5c36857f04f030ec 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -212,6 +212,9 @@ gitlink:git-cvsexportcommit[1]::
 gitlink:git-cvsserver[1]::
        A CVS server emulator for git.
 
+gitlink:git-gc[1]::
+       Cleanup unnecessary files and optimize the local repository.
+
 gitlink:git-lost-found[1]::
        Recover lost refs that luckily have not yet been pruned.
 
@@ -224,6 +227,9 @@ gitlink:git-prune[1]::
 gitlink:git-quiltimport[1]::
        Applies a quilt patchset onto the current branch.
 
+gitlink:git-reflog[1]::
+       Manage reflog information.
+
 gitlink:git-relink[1]::
        Hardlink common objects in local repositories.
 
@@ -252,7 +258,7 @@ gitlink:git-annotate[1]::
        Annotate file lines with commit info.
 
 gitlink:git-blame[1]::
-       Blame file lines on commits.
+       Find out where each line in a file came from.
 
 gitlink:git-check-ref-format[1]::
        Make sure ref name is well formed.
@@ -302,6 +308,9 @@ gitlink:git-request-pull[1]::
 gitlink:git-rev-parse[1]::
        Pick out and massage parameters.
 
+gitlink:git-runstatus[1]::
+       A helper for git-status and git-commit.
+
 gitlink:git-send-email[1]::
        Send patch e-mails out of "format-patch --mbox" output.
 
@@ -344,10 +353,13 @@ gitlink:git-hash-object[1]::
 gitlink:git-index-pack[1]::
        Build pack idx file for an existing packed archive.
 
-gitlink:git-init-db[1]::
-       Creates an empty git object database, or reinitialize an
+gitlink:git-init[1]::
+       Creates an empty git repository, or reinitialize an
        existing one.
 
+gitlink:git-merge-file[1]::
+       Runs a threeway merge.
+
 gitlink:git-merge-index[1]::
        Runs a merge for files needing merging.
 
@@ -636,11 +648,35 @@ git Commits
 git Diffs
 ~~~~~~~~~
 'GIT_DIFF_OPTS'::
+       Only valid setting is "--unified=??" or "-u??" to set the
+       number of context lines shown when a unified diff is created.
+       This takes precedence over any "-U" or "--unified" option
+       value passed on the git diff command line.
+
 'GIT_EXTERNAL_DIFF'::
-       see the "generating patches" section in :
-       gitlink:git-diff-index[1];
-       gitlink:git-diff-files[1];
-       gitlink:git-diff-tree[1]
+       When the environment variable 'GIT_EXTERNAL_DIFF' is set, the
+       program named by it is called, instead of the diff invocation
+       described above.  For a path that is added, removed, or modified,
+        'GIT_EXTERNAL_DIFF' is called with 7 parameters:
+
+       path old-file old-hex old-mode new-file new-hex new-mode
++
+where:
+
+       <old|new>-file:: are files GIT_EXTERNAL_DIFF can use to read the
+                         contents of <old|new>,
+       <old|new>-hex:: are the 40-hexdigit SHA1 hashes,
+       <old|new>-mode:: are the octal representation of the file modes.
+
++
+The file parameters can point at the user's working file
+(e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file`
+when a new file is added), or a temporary file (e.g. `old-file` in the
+index).  'GIT_EXTERNAL_DIFF' should not worry about unlinking the
+temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits.
++
+For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1
+parameter, <path>.
 
 other
 ~~~~~