diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-09-18 20:19:30 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-09-18 20:19:30 -0700 |
commit | c4398286fa5245cf54d73f6016444179d73f140b (patch) | |
tree | 7615ae9e816ae37148e70e335a1d95a54216e890 /builtin-diff.c | |
parent | 8435bdfdc3dca1b19721e013374d936164928e33 (diff) | |
parent | 5f020f720298ddba537f857a240ffa7debb05f54 (diff) | |
download | git-c4398286fa5245cf54d73f6016444179d73f140b.tar.gz |
Merge branch 'np/pack'
* np/pack:
t5300: improve SHA1 collision test
pack-objects: don't include missing preferred base objects
sha1write: don't copy full sized buffers
Conflicts:
t/t5300-pack-object.sh
Diffstat (limited to 'builtin-diff.c')
0 files changed, 0 insertions, 0 deletions