Merge branch 'jh/fetch-head-update'

* jh/fetch-head-update:
  write first for-merge ref to FETCH_HEAD first

diff --combined Documentation/git-read-tree.txt
index a43e87448ba035278b58b191ea7c1c04179985a6,2d3ff235d4890951deaab2de3700b843c0c18db5..c4bde6509e5a2f652dca9345a3a28e9e674c216a
--- 1/Documentation/git-read-tree.txt
--- 2/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@@ -83,10 -83,11 +83,10 @@@ OPTION
  
  --prefix=<prefix>/::
        Keep the current index contents, and read the contents
 -      of the named tree-ish under the directory at `<prefix>`. The
 -      original index file cannot have anything at the path
 -      `<prefix>` itself, nor anything in the `<prefix>/`
 -      directory.  Note that the `<prefix>/` value must end
 -      with a slash.
 +      of the named tree-ish under the directory at `<prefix>`.
 +      The command will refuse to overwrite entries that already
 +      existed in the original index file. Note that the `<prefix>/`
 +      value must end with a slash.
  
  --exclude-per-directory=<gitignore>::
        When running the command with `-u` and `-m` options, the
@@@ -341,7 -342,7 +341,7 @@@ since you pulled from him
  
  ----------------
  $ git fetch git://.... linus
- $ LT=`cat .git/FETCH_HEAD`
+ $ LT=`git rev-parse FETCH_HEAD`
  ----------------
  
  Your work tree is still based on your HEAD ($JC), but you have