diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-05-26 18:53:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-26 18:53:22 -0700 |
| commit | c56ed464b0ba275d9f2e3598c61b391e98fc217b (patch) | |
| tree | f8d204103c41c8decf415c34a1b48b8c9bc9bd54 /git-rebase.sh | |
| parent | fixes to output of git-verify-pack -v (diff) | |
| parent | Merge branch 'maint-1.5.1' into maint (diff) | |
| download | tgif-c56ed464b0ba275d9f2e3598c61b391e98fc217b.tar.xz | |
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
Diffstat (limited to 'git-rebase.sh')
0 files changed, 0 insertions, 0 deletions