Merge git://repo.or.cz/git-gui into maint

diff --git a/Documentation/git-tar-tree.txt b/Documentation/git-tar-tree.txt
index 74a6fddd9a9f9d6831922fb163240c2a2c06994e..595940524e7d7f1112700899cf74e24e1c2e1e87 100644 (file)
--- a/Documentation/git-tar-tree.txt
+++ b/Documentation/git-tar-tree.txt
@@ -3,7 +3,7 @@ git-tar-tree(1)
 
 NAME
 ----
-git-tar-tree - Creates a tar archive of the files in the named tree
+git-tar-tree - Create a tar archive of the files in the named tree object
 
 
 SYNOPSIS
@@ -50,7 +50,7 @@ repository configuration as follows :
         umask = 002    ;# group friendly
 
 The special umask value "user" indicates that the user's current umask
-will be used instead. The default value remains 0, which means world
+will be used instead.  The default value is 002, which means group
 readable/writable files and directories.
 
 EXAMPLES