Merge branch 'maint'
commitba988a83f0cfdafdcfdc7ed44253840ea83578fb
authorJunio C Hamano <junkio@cox.net>
Tue, 5 Dec 2006 00:30:00 +0000 (4 16:30 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 5 Dec 2006 00:30:00 +0000 (4 16:30 -0800)
treecee119a3eccf55b60a44fe29974fb108cd527739
parent4cd75359ad5d4c90ba6ae6d68ffb6d00e5092b8a
parent562cefbdbfaeb92f91c961c67960a93a7772220c
Merge branch 'maint'

* 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
receive-pack.c