Merge branch 'master'
authorJunio C Hamano <junkio@cox.net>
Sun, 12 Feb 2006 13:03:40 +0000 (05:03 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 12 Feb 2006 13:03:40 +0000 (05:03 -0800)
* master:
Add howto about separating topics.
Merge branch 'pb/repo'
Add support for explicit type specifiers when calling git-repo-config
Merge branch 'jc/fixdiff'
diff-tree: do not default to -c
Avoid using "git-var -l" until it gets fixed.
t5500: adjust to change in pack-object reporting behaviour.
Only call git-rerere if $GIT_DIR/rr-cache exists.
Use a relative path for SVN importing
fetch-clone progress: finishing touches.
Fix fetch-clone in the presense of signals
Make "git clone" pack-fetching download statistics better
Make "git clone" less of a deathly quiet experience

1  2 
cache.h
diff --cc cache.h
Simple merge