diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-02-24 21:55:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-24 21:55:23 -0800 |
| commit | f0b0af1b04f558b684cae2a3b805ca4bab84d45f (patch) | |
| tree | 2cd7477b64b6a732adce241d1403830df2b15c38 /gitMergeCommon.py | |
| parent | gitview: Fix the graph display . (diff) | |
| parent | rev-list --objects: use full pathname to help hashing. (diff) | |
| parent | pack-objects: hash basename and direname a bit differently. (diff) | |
| download | tgif-f0b0af1b04f558b684cae2a3b805ca4bab84d45f.tar.xz | |
Merge branches 'jc/rev-list' and 'jc/pack-thin'
* 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")