![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 8 Aug 2006 00:02:07 +0000 (17:02 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 8 Aug 2006 00:02:07 +0000 (17:02 -0700) | ||
| commit | 9673198ee867cea4ed70d2cf54c1a2eb8f27bb46 | |
| tree | f06a5be02102b0a78f56e18beffa8fa5c3e70b6e | tree | snapshot |
| parent | 96bc4de85cf810db5c7cd94bf0688a98a64a0bc7 | commit | diff |
| parent | 7c49cb288173ab5264b3b9e4257aeeb13388334c | commit | diff |
Merge branch 'master' into pb/gitpm
This is to resolve the conflicts with Ryan's annotate updates early.
This is to resolve the conflicts with Ryan's annotate updates early.
12 files changed:
| Documentation/git-repo-config.txt | diff1 | | diff2 | | blob | history |
| INSTALL | diff1 | | diff2 | | blob | history |
| Makefile | diff1 | | diff2 | | blob | history |
| builtin-repo-config.c | | | diff2 | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |
| commit.c | diff1 | | diff2 | | blob | history |
| environment.c | diff1 | | diff2 | | blob | history |
| git-annotate.perl | diff1 | | diff2 | | blob | history |
| git-send-email.perl | diff1 | | diff2 | | blob | history |
| sha1_file.c | diff1 | | diff2 | | blob | history |
| sha1_name.c | diff1 | | diff2 | | blob | history |
| t/test-lib.sh | diff1 | | diff2 | | blob | history |