![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 5 Dec 2006 00:30:00 +0000 (16:30 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 5 Dec 2006 00:30:00 +0000 (16:30 -0800) | ||
| commit | ba988a83f0cfdafdcfdc7ed44253840ea83578fb | |
| tree | cee119a3eccf55b60a44fe29974fb108cd527739 | tree | snapshot |
| parent | 4cd75359ad5d4c90ba6ae6d68ffb6d00e5092b8a | commit | diff |
| parent | 562cefbdbfaeb92f91c961c67960a93a7772220c | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |