author | Junio C Hamano <junkio@cox.net> | |
Sat, 25 Feb 2006 02:55:25 +0000 (18:55 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sat, 25 Feb 2006 02:55:25 +0000 (18:55 -0800) | ||
commit | 52e8a6e9bf92a38015ab8f6d19dabeff7acc0651 | |
tree | c472c26b6c965dc480b7a9743c5590dddb497e49 | tree | snapshot |
parent | 9e4f522da7da8bf5f9018927c82b12e6b02b9058 | commit | diff |
parent | e646de0d14bac20ef6e156c1742b9e62fb0b9020 | commit | diff |
parent | eeef7135fed9b8784627c4c96e125241c06c65e1 | commit | diff |
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 (manual adjustment for thin pack needed)
send-pack.c
* 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 (manual adjustment for thin pack needed)
send-pack.c
git-fetch.sh | diff1 | | diff2 | | diff3 | | blob | history |
pack-objects.c | diff1 | | diff2 | | diff3 | | blob | history |
rev-list.c | diff1 | | diff2 | | diff3 | | blob | history |
send-pack.c | diff1 | | diff2 | | diff3 | | blob | history |
upload-pack.c | diff1 | | diff2 | | diff3 | | blob | history |