mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

faster union merge of multiple branches into index

Browse source 
only write index once
This commit is contained in:
Joey Hess 2011-10-07 13:17:54 -04:00
parent 5414bbce58
commit 3acdba3995
3 changed files with 21 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
git-union-merge.hs
View file

@ -41,6 +41,6 @@ main = do
g <- Git.configRead =<< Git.repoFromCwd
_ <- Git.useIndex (tmpIndex g)
setup g
Git.UnionMerge.merge g [aref, bref]
Git.UnionMerge.merge g aref bref
Git.commit g "union merge" newref [aref, bref]
cleanup g