diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-15 09:31:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-15 09:31:04 (GMT) |
| commit | cd0a781c386b197e63a30104bead39420eada7ca (patch) | |
| tree | 8ea8ba4b812ca2bc384ccc117da7fd4f4516f000 /Documentation/git-diff-index.txt | |
| parent | 313c4714c5ec1673805b952ba79d910a42e8937c (diff) | |
| download | git-cd0a781c386b197e63a30104bead39420eada7ca.zip git-cd0a781c386b197e63a30104bead39420eada7ca.tar.gz git-cd0a781c386b197e63a30104bead39420eada7ca.tar.bz2 | |
Documentation: do not blindly run 'cat' .git/HEAD, or echo into it.
Many places in the documentation we still talked about reading
what commit is recorded in .git/HEAD or writing the new head
information into it, both assuming .git/HEAD is a symlink. That
is not necessarily so.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-diff-index.txt')
| -rw-r--r-- | Documentation/git-diff-index.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt index d8fc78f..dba6d30 100644 --- a/Documentation/git-diff-index.txt +++ b/Documentation/git-diff-index.txt @@ -57,14 +57,14 @@ some files in the index and are ready to commit. You want to see eactly *what* you are going to commit is without having to write a new tree object and compare it that way, and to do that, you just do - git-diff-index --cached $(cat .git/HEAD) + git-diff-index --cached HEAD Example: let's say I had renamed `commit.c` to `git-commit.c`, and I had done an "git-update-index" to make that effective in the index file. "git-diff-files" wouldn't show anything at all, since the index file matches my working directory. But doing a "git-diff-index" does: - torvalds@ppc970:~/git> git-diff-index --cached $(cat .git/HEAD) + torvalds@ppc970:~/git> git-diff-index --cached HEAD -100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c +100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 git-commit.c @@ -98,7 +98,7 @@ show that. So let's say that you have edited `kernel/sched.c`, but have not actually done a "git-update-index" on it yet - there is no "object" associated with the new state, and you get: - torvalds@ppc970:~/v2.6/linux> git-diff-index $(cat .git/HEAD ) + torvalds@ppc970:~/v2.6/linux> git-diff-index HEAD *100644->100664 blob 7476bb......->000000...... kernel/sched.c ie it shows that the tree has changed, and that `kernel/sched.c` has is |