Merge branches 'jc/rev-list' and 'jc/pack-thin'
authorJunio C Hamano <junkio@cox.net>
Sat, 25 Feb 2006 05:55:23 +0000 (21:55 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 25 Feb 2006 05:55:23 +0000 (21:55 -0800)
* jc/rev-list:
rev-list --objects: use full pathname to help hashing.
rev-list --objects-edge: remove duplicated edge commit output.
rev-list --objects-edge

* jc/pack-thin:
pack-objects: hash basename and direname a bit differently.
pack-objects: allow "thin" packs to exceed depth limits
pack-objects: use full pathname to help hashing with "thin" pack.
pack-objects: thin pack micro-optimization.
Use thin pack transfer in "git fetch".
Add git-push --thin.
send-pack --thin: use "thin pack" delta transfer.
Thin pack - create packfile with missing delta base.

Conflicts:

pack-objects.c (taking "next")
send-pack.c (taking "next")

No differences found