Use Daniel's read-tree in the merge strategy 'resolve'.

diff --git a/Documentation/git-update-server-info.txt b/Documentation/git-update-server-info.txt
index 4f65acbc8c86d29a154a9785eaed9abebaa757f3..74c4364ad847e29a1e1918b1d1c7781454d064fb 100644 (file)
--- a/Documentation/git-update-server-info.txt
+++ b/Documentation/git-update-server-info.txt
@@ -16,7 +16,7 @@ DESCRIPTION
 A dumb server that does not do on-the-fly pack generations can
 have some auxiliary information files in $GIT_DIR/info and
 $GIT_OBJECT_DIRECTORY/info directories to help clients discover
-what references and packs the server has and make an optimized
+what references and packs the server has and make optimized
 pull decisions.  This command generates such auxiliary files.
 
 
@@ -24,8 +24,27 @@ OPTIONS
 -------
 
 --force::
-       Update the info files even when they do not appear
-       stale.
+       Update the info files from scratch.
+
+
+OUTPUT
+------
+
+Currently the command updates the following files.  Please see
+link:repository-layout.html[repository-layout] for description
+of what they are for:
+
+* objects/info/packs
+
+* info/refs
+
+* info/rev-cache
+
+
+BUGS
+----
+When you remove an existing ref, the command fails to update
+info/refs file unless `--force` flag is given.
 
 
 Author