Merge branch 'maint'

[git.git] / Documentation / git-diff-index.txt

diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt
index 9cd43f105bd78778359ded7c6b3300502d642ca9..7bd262cefd68efe84ff0c405af5eabcdc6f01be8 100644 (file)
--- a/Documentation/git-diff-index.txt
+++ b/Documentation/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
 
 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
 object and compare it that way, and to do that, you just do
 
        git-diff-index --cached HEAD


@@ -68,14 +68,14 @@ matches my working directory. But doing a "git-diff-index" does:
   -100644 blob    4161aecc6700a2eb579e842af0b7f22b98443f74        commit.c
   +100644 blob    4161aecc6700a2eb579e842af0b7f22b98443f74        git-commit.c
 
   -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
 nicer for the case where you just want to check where you are.
 
 So doing a "git-diff-index --cached" is basically very useful when you are
 
 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
 nicer for the case where you just want to check where you are.
 
 So doing a "git-diff-index --cached" is basically very useful when you are

-asking yourself "what have I already marked for being committed, and 
+asking yourself "what have I already marked for being committed, and

 what's the difference to a previous tree".
 
 Non-cached Mode
 what's the difference to a previous tree".
 
 Non-cached Mode


@@ -130,4 +130,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 GIT
 ---
 Part of the gitlink:git[7] suite
 GIT
 ---
 Part of the gitlink:git[7] suite

-