summaryrefslogtreecommitdiffstats
path: root/git-diff-index.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-11-03 02:40:13 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-11-03 02:40:13 +0000
commitdcc22ee22803fe091761047d69d9252945b04a19 (patch)
treed38a41bf355050d4c4b89656026b9efdc8c2d96e /git-diff-index.txt
parenta2ec14f96e29dae631eb6013e11e0f03dc934660 (diff)
downloadgit-htmldocs-dcc22ee22803fe091761047d69d9252945b04a19.tar.gz
Autogenerated HTML docs for v1.4.3.3-gc954
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 9cd43f105..2df581c2c 100644
--- a/git-diff-index.txt
+++ b/git-diff-index.txt
@@ -54,7 +54,7 @@ If '--cached' is specified, it allows you to ask:
For example, let's say that you have worked on your working directory, updated
some files in the index and are ready to commit. You want to see exactly
-*what* you are going to commit is without having to write a new tree
+*what* you are going to commit, without having to write a new tree
object and compare it that way, and to do that, you just do
git-diff-index --cached HEAD
@@ -68,7 +68,7 @@ matches my working directory. But doing a "git-diff-index" does:
-100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c
+100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 git-commit.c
-You can trivially see that the above is a rename.
+You can see easily that the above is a rename.
In fact, "git-diff-index --cached" *should* always be entirely equivalent to
actually doing a "git-write-tree" and comparing that. Except this one is much