Merge http://www.kernel.org/pub/scm/gitk/gitk

[git.git] / Documentation / git-write-tree.txt

diff --git a/Documentation/git-write-tree.txt b/Documentation/git-write-tree.txt
index 458d97a..51be44d 100644 (file)
--- a/Documentation/git-write-tree.txt
+++ b/Documentation/git-write-tree.txt
@@ -1,15 +1,14 @@
 git-write-tree(1)
 =================
-v0.1, May 2005
 
 NAME
 ----
-git-write-tree - Creates a tree from the current cache
+git-write-tree - Creates a tree object from the current cache
 
 
 SYNOPSIS
 --------
-'git-write-tree'
+'git-write-tree' [--missing-ok]
 
 DESCRIPTION
 -----------
@@ -20,24 +19,15 @@ The cache must be merged.
 Conceptually, "git-write-tree" sync()s the current directory cache contents
 into a set of tree files.
 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
+now, you need to have done a "git-update-index" 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>
@@ -48,5 +38,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite