| commit | c56ed464b0ba275d9f2e3598c61b391e98fc217b | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 27 May 2007 01:53:22 +0000 (26 18:53 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 27 May 2007 01:53:22 +0000 (26 18:53 -0700) | ||
| tree | f8d204103c41c8decf415c34a1b48b8c9bc9bd54 | treesnapshot (tar.gz zip) |
| parent | ddcf786fd7d5755711439371dcfd9a7ba1dfa7a5 | commitdiff |
| parent | d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a | commitdiff |
Merge branch 'maint'
* maint:
Fix git-svn to handle svn not reporting the md5sum of a file, and test.
Fix mishandling of $Id$ expanded in the repository copy in convert.c
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
* maint:
Fix git-svn to handle svn not reporting the md5sum of a file, and test.
Fix mishandling of $Id$ expanded in the repository copy in convert.c
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
| diff.c | diff1 | diff2 | blobhistory |
| git-merge.sh | diff1 | diff2 | blobhistory |