summaryrefslogtreecommitdiff
path: root/git-union-merge.hs
Commit message (Expand)AuthorAge
* add journaling to speed up changes to the git-annex branchGravatar Joey Hess2011-06-23
* allow for union merges between a tree and the content in the indexGravatar Joey Hess2011-06-21
* export the commit function and generalizeGravatar Joey Hess2011-06-21
* Branch module completeGravatar Joey Hess2011-06-21
* refactorGravatar Joey Hess2011-06-21
* moved to libraryGravatar Joey Hess2011-06-21
* typoGravatar Joey Hess2011-06-20
* reorder git-union-merge paramsGravatar Joey Hess2011-06-20
* allow git-union-merge to write to any refGravatar Joey Hess2011-06-20
* sped up git-union-mergeGravatar Joey Hess2011-06-20
* add git-union-mergeGravatar Joey Hess2011-06-20