From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jan 2012 20:44:01 +0000 (-0800)
Subject: Merge branch 'jh/fetch-head-update'
X-Git-Tag: v1.7.9-rc0~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1067f8dd0eef81062f740ba4bc680ac9649a0d42?ds=inline;hp=-c

Merge branch 'jh/fetch-head-update'

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

1067f8dd0eef81062f740ba4bc680ac9649a0d42
diff --combined Documentation/git-read-tree.txt
index a43e87448b,2d3ff235d4..c4bde6509e
--- a/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