contrib/subtree/Makefile: use GIT-VERSION-FILE

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 56fb7e532227fa8a69b9e9ada92a1d8eb330c7d6..bbab35fcaff35ccd5459251550924a42ce2c871e 100644 (file)
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -158,8 +158,8 @@ $ git diff --name-status                <2>
 $ git diff arch/i386 include/asm-i386   <3>
 ------------
 +
-<1> Show only modification, rename and copy, but not addition
-nor deletion.
+<1> Show only modification, rename, and copy, but not addition
+or deletion.
 <2> Show only names and the nature of change, but not actual
 diff output.
 <3> Limit diff output to named subtrees.