X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit.txt;h=2a9e97dac1e2c21a8a4aa7a6501a054fcefbef35;hb=54851157acf707eb953eada2a84830897dde5c1d;hp=0679e3c209278d07173007e514c09e78fe9a4e49;hpb=01cff2d2ca77dc050973e1fc4702119a715cc919;p=git.git

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 0679e3c20..2a9e97dac 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -141,6 +141,9 @@ gitlink:git-merge[1]::
 gitlink:git-mv[1]::
 	Move or rename a file, a directory, or a symlink.
 
+gitlink:git-pack-refs[1]::
+	Pack heads and tags for efficient repository access.
+
 gitlink:git-pull[1]::
 	Fetch from and merge with a remote repository or a local branch.
 
@@ -249,7 +252,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.
@@ -299,6 +302,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.
 
@@ -345,6 +351,9 @@ gitlink:git-init-db[1]::
 	Creates an empty git object database, 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.
 
@@ -424,6 +433,9 @@ gitlink:git-rev-list[1]::
 gitlink:git-show-index[1]::
 	Displays contents of a pack idx file.
 
+gitlink:git-show-ref[1]::
+	List references in a local repository.
+
 gitlink:git-tar-tree[1]::
 	Creates a tar archive of the files in the named tree object.
 
@@ -630,11 +642,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
 ~~~~~