Optimised union merging; now only runs git cat-file once.

This commit is contained in:
Joey Hess 2011-11-12 17:45:12 -04:00
parent cea65b9e5b
commit 04edae6791
7 changed files with 62 additions and 36 deletions

1
debian/changelog vendored
View file

@ -6,6 +6,7 @@ git-annex (3.20111112) UNRELEASED; urgency=low
no longer needs to auto-merge.
* init: When run in an already initalized repository, and without
a description specified, don't delete the old description.
* Optimised union merging; now only runs git cat-file once.
-- Joey Hess <joeyh@debian.org> Sat, 12 Nov 2011 14:50:21 -0400