Merge with gitk.

diff --git a/Documentation/git-write-tree.txt b/Documentation/git-write-tree.txt
index 458d97ac986ff7324c105b5fe0222507ce514f04..3b6a66fef648eeeb2bf75c39af1670495eaffe88 100644 (file)
--- a/Documentation/git-write-tree.txt
+++ b/Documentation/git-write-tree.txt
@@ -9,7 +9,7 @@ git-write-tree - Creates a tree from the current cache
 
 SYNOPSIS
 --------
-'git-write-tree'
+'git-write-tree' [--missing-ok]
 
 DESCRIPTION
 -----------
@@ -23,21 +23,12 @@ In order to have that match what is actually in your directory right
 now, you need to have done a "git-update-cache" phase before you did the
 "git-write-tree".
 
+OPTIONS
+-------
+--missing-ok::
+       Normally "git-write-tree" ensures that the objects referenced by the
+       directory exist in the object database.  This option disables this check.
 
-
-
-////////////////////////////////////////////////////////////////
-
-Producing man pages and html
-
-To create a set of html pages run:
-  perl split-docs.pl -html < core-git.txt
-
-To create a set of man pages run:
-  perl split-docs.pl -man < core-git.txt
-
-
-////////////////////////////////////////////////////////////////
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>