Merge branch 'master' into pb/gitpm
commit9673198ee867cea4ed70d2cf54c1a2eb8f27bb46
authorJunio C Hamano <junkio@cox.net>
Tue, 8 Aug 2006 00:02:07 +0000 (7 17:02 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 8 Aug 2006 00:02:07 +0000 (7 17:02 -0700)
treef06a5be02102b0a78f56e18beffa8fa5c3e70b6e
parent96bc4de85cf810db5c7cd94bf0688a98a64a0bc7
parent7c49cb288173ab5264b3b9e4257aeeb13388334c
Merge branch 'master' into pb/gitpm

This is to resolve the conflicts with Ryan's annotate updates early.
12 files changed:
Documentation/git-repo-config.txt
INSTALL
Makefile
builtin-repo-config.c
cache.h
commit.c
environment.c
git-annotate.perl
git-send-email.perl
sha1_file.c
sha1_name.c
t/test-lib.sh