diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-14 16:23:22 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-14 16:23:22 -0400 |
| commit | 2e07411c7f08f789c217299b52ecf9bd57e6e86d (patch) | |
| tree | 0b907bbca076a521ea29cdd413f84c7b11d5177d /debian | |
| parent | 0ca84a5da638e4a5e0da02555819182b3b9de715 (diff) | |
Sped up git-annex merge by using git hash-object --batch.
This does mean that it has to write out temp files containing updated
objects for the merge. So may use more disk space, and disk IO, but that
should generally win out over needing to launch N separate
git hash-object processes.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index d5b98c192..80d07cb77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ git-annex (6.20160230) UNRELEASED; urgency=medium * Correct git-annex info to include unlocked files in v6 repository. * Sped up git-annex add in direct mode and v6 by using git hash-object --batch. + * Sped up git-annex merge by using git hash-object --batch. -- Joey Hess <id@joeyh.name> Mon, 29 Feb 2016 13:00:30 -0400 |