diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-05-26 01:30:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-26 01:30:40 -0700 |
| commit | d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a (patch) | |
| tree | 929a074f6c4001add762cdaefc11887a6a291966 /diff.c | |
| parent | Fix mishandling of $Id$ expanded in the repository copy in convert.c (diff) | |
| parent | Fix git-svn to handle svn not reporting the md5sum of a file, and test. (diff) | |
| download | tgif-d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a.tar.xz | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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. */ |