Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rs/xdiff-fast-hash-fix'
[gitweb.git]
/
Documentation
/
git-read-tree.txt
diff --git
a/Documentation/git-read-tree.txt
b/Documentation/git-read-tree.txt
index a43e87448ba035278b58b191ea7c1c04179985a6..c4bde6509e5a2f652dca9345a3a28e9e674c216a 100644
(file)
--- a/
Documentation/git-read-tree.txt
+++ b/
Documentation/git-read-tree.txt
@@
-341,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