summaryrefslogtreecommitdiff
path: root/doc/todo
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-11-15 23:48:50 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-11-15 23:51:24 -0400
commite83b966eb5197171a6af46595049d661c4229c58 (patch)
tree7bf1e84cfd19c34906a981bb088b50f0717351f3 /doc/todo
parent21a925dcf1ebe088b5c64da0ce159ffb6d535f04 (diff)
cleanup
Diffstat (limited to 'doc/todo')
-rw-r--r--doc/todo/optimise_git-annex_merge.mdwn6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/todo/optimise_git-annex_merge.mdwn b/doc/todo/optimise_git-annex_merge.mdwn
index 2df196cfd..91d18ebd7 100644
--- a/doc/todo/optimise_git-annex_merge.mdwn
+++ b/doc/todo/optimise_git-annex_merge.mdwn
@@ -15,3 +15,9 @@ merged. This could be reduced to a single call to `git-cat-file --batch`,
There is already a Git.CatFile library that can do this easily. --[[Joey]]
> This is now done, part above remains todo. --[[Joey]]
+
+---
+
+Merging used to use memory proportional to the size of the diff. It now
+streams data, running in constant space. This probably sped it up a lot,
+as there's much less allocation and GC action. --[[Joey]]