Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Tue, 5 Dec 2006 00:30:00 +0000 (16:30 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 5 Dec 2006 00:30:00 +0000 (16:30 -0800)
* maint:
receive-pack: do not insist on fast-forward outside refs/heads/
git-mv: search more precisely for source directory in index

Conflicts:

receive-pack.c

No differences found