Merge branch 'maint-1.5.1' into maint
Junio C Hamano committed over 19 years ago
Move refspec pattern matching to match_refs().
Daniel Barkalow committed over 19 years ago
Fix git-svn to handle svn not reporting the md5sum of a file, and test.
James Y Knight committed over 19 years ago
Fix mishandling of $Id$ expanded in the repository copy in convert.c
Andy Parkins committed over 19 years ago
More echo "$user_message" fixes.
Jeff King committed over 19 years ago
Add tests for the last two fixes.
Junio C Hamano committed over 19 years ago
git-commit: use printf '%s\n' instead of echo on user-supplied strings
Junio C Hamano committed over 19 years ago
git-am: use printf instead of echo on user-supplied strings
Jeff King committed over 19 years ago
fixes to output of git-verify-pack -v
Nicolas Pitre committed over 19 years ago
Documentation: Add definition of "evil merge" to GIT Glossary
Jakub Narebski committed over 19 years ago
Replace the last 'dircache's by 'index'
Jakub Narebski committed over 19 years ago
Documentation: Clean up links in GIT Glossary
Jakub Narebski committed over 19 years ago
Added git-p4 submit --trust-me-like-a-fool for the adventurous users :)
Simon Hausmann committed over 19 years ago
Forgot to remove this TODO item when I made --with-origin the default :)
Simon Hausmann committed over 19 years ago
Shortcut the case where we have no origin branch
Simon Hausmann committed over 19 years ago
Make --with-origin the default for syncing.
Simon Hausmann committed over 19 years ago
Make --with-origin also work without origin :)
Simon Hausmann committed over 19 years ago
Make git-p4 work with packed refs (don't use os.path.exists to check for the existance of a ref)
Simon Hausmann committed over 19 years ago
Avoid creating non-p4 branches in remotes/p4 off of remotes/origin
Simon Hausmann committed over 19 years ago
Add a configuration option to control diffstat after merge
Alex Riesen committed over 19 years ago