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 /attr.c | |
parent | c23290d528c208a25641f0fc278bac9bb9838265 (diff) | |
parent | 20b3d206acbbb042c7ad5f42d36ff8d036a538c5 (diff) | |
download | git-d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a.tar.gz |
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 'attr.c')
0 files changed, 0 insertions, 0 deletions