summaryrefslogtreecommitdiffstats
path: root/git-diff-index.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-05-31 19:53:33 +0000
committerJunio C Hamano <junio@kernel.org>2011-05-31 19:53:33 +0000
commitef5a2f9e08ac9deed3c3270103ed08c65b5177ab (patch)
tree20237e00af046145b63e1ab7fe5c15a374d7dedb /git-diff-index.txt
parent084228c6c49d30cf3c49994c8de0b192b364ac0d (diff)
downloadgit-htmldocs-ef5a2f9e08ac9deed3c3270103ed08c65b5177ab.tar.gz
Autogenerated HTML docs for v1.7.5.3-485-g090a1
Diffstat (limited to 'git-diff-index.txt')
-rw-r--r--git-diff-index.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-diff-index.txt b/git-diff-index.txt
index 6d1848640..2ea22abca 100644
--- a/git-diff-index.txt
+++ b/git-diff-index.txt
@@ -96,8 +96,8 @@ 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 HEAD
- *100644->100664 blob 7476bb......->000000...... kernel/sched.c
+ torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD
+ :100644 100664 7476bb... 000000... kernel/sched.c
i.e., it shows that the tree has changed, and that `kernel/sched.c` has is
not up-to-date and may contain new stuff. The all-zero sha1 means that to