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 7f076b4..abee05f 100644 (file)
--- a/Documentation/git-write-tree.txt
+++ b/Documentation/git-write-tree.txt
@@ -1,27 +1,25 @@
 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 index
 
 
 SYNOPSIS
 --------
-'git-write-tree'
-               [--missing-ok]
+'git-write-tree' [--missing-ok]
 
 DESCRIPTION
 -----------
-Creates a tree object using the current cache.
+Creates a tree object using the current index.
 
-The cache must be merged.
+The index must be merged.
 
-Conceptually, "git-write-tree" sync()s the current directory cache contents
+Conceptually, "git-write-tree" sync()s the current index 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
@@ -40,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