diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:44:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:44:01 -0800 |
| commit | 1067f8dd0eef81062f740ba4bc680ac9649a0d42 (patch) | |
| tree | 345dd16fb46de3db319cae484e2c2bf4bdca25c1 /Documentation/git-read-tree.txt | |
| parent | 8cbfc1189cfc23f96f797a64bcb0c050b6ecc6e6 (diff) | |
| parent | 96890f4c428ed62cf52c11aba5773d364a8d6234 (diff) | |
| download | git-1067f8dd0eef81062f740ba4bc680ac9649a0d42.tar.gz | |
Merge branch 'jh/fetch-head-update'
* jh/fetch-head-update:
write first for-merge ref to FETCH_HEAD first
Diffstat (limited to 'Documentation/git-read-tree.txt')
| -rw-r--r-- | Documentation/git-read-tree.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index a43e87448b..c4bde6509e 100644 --- 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 |