summaryrefslogtreecommitdiff
path: root/GitUnionMerge.hs
Commit message (Expand)AuthorAge
* fix merge_tree_indexGravatar Joey Hess2011-06-23
* add journaling to speed up changes to the git-annex branchGravatar Joey Hess2011-06-23
* merge bugfixGravatar Joey Hess2011-06-22
* rework core merge codeGravatar Joey Hess2011-06-22
* 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