summaryrefslogtreecommitdiff
path: root/builtin-count-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-27 01:53:22 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-27 01:53:22 (GMT)
commitc56ed464b0ba275d9f2e3598c61b391e98fc217b (patch)
treef8d204103c41c8decf415c34a1b48b8c9bc9bd54 /builtin-count-objects.c
parentddcf786fd7d5755711439371dcfd9a7ba1dfa7a5 (diff)
parentd1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a (diff)
downloadgit-c56ed464b0ba275d9f2e3598c61b391e98fc217b.zip
git-c56ed464b0ba275d9f2e3598c61b391e98fc217b.tar.gz
git-c56ed464b0ba275d9f2e3598c61b391e98fc217b.tar.bz2
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 'builtin-count-objects.c')
0 files changed, 0 insertions, 0 deletions