summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-26 08:30:40 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-26 08:30:40 (GMT)
commitd1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a (patch)
tree929a074f6c4001add762cdaefc11887a6a291966 /diff.c
parentc23290d528c208a25641f0fc278bac9bb9838265 (diff)
parent20b3d206acbbb042c7ad5f42d36ff8d036a538c5 (diff)
downloadgit-d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a.zip
git-d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a.tar.gz
git-d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a.tar.bz2
Merge branch 'maint-1.5.1' into maint
* maint-1.5.1: Fix git-svn to handle svn not reporting the md5sum of a file, and test. More echo "$user_message" fixes. Add tests for the last two fixes. git-commit: use printf '%s\n' instead of echo on user-supplied strings git-am: use printf instead of echo on user-supplied strings Documentation: Add definition of "evil merge" to GIT Glossary Replace the last 'dircache's by 'index' Documentation: Clean up links in GIT Glossary
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index b23e190..af282dd 100644
--- a/diff.c
+++ b/diff.c
@@ -1349,7 +1349,7 @@ void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
}
/*
- * Given a name and sha1 pair, if the dircache tells us the file in
+ * Given a name and sha1 pair, if the index tells us the file in
* the work tree has that object contents, return true, so that
* prepare_temp_file() does not have to inflate and extract.
*/