]> git.ipfire.org Git - thirdparty/git.git/commit - builtin-receive-pack.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4cd7535 562cefb)
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)
commitba988a83f0cfdafdcfdc7ed44253840ea83578fb
treecee119a3eccf55b60a44fe29974fb108cd527739tree | snapshot
parent4cd75359ad5d4c90ba6ae6d68ffb6d00e5092b8acommit | diff
parent562cefbdbfaeb92f91c961c67960a93a7772220ccommit | 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
receive-pack.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.