summaryrefslogtreecommitdiff
path: root/Assistant/Threads/Merger.hs
Commit message (Expand)AuthorAge
* use gitRepoGravatar Joey Hess2012-10-12
* run current branch merge in annex monadGravatar Joey Hess2012-09-17
* deferred downloadsGravatar Joey Hess2012-09-17
* better name for fallback sync refsGravatar Joey Hess2012-09-16
* ensure outgoing sync pushes always succeed when repo is accessibleGravatar Joey Hess2012-09-16
* make the merger merge any equivilant sync branch into the current branchGravatar Joey Hess2012-09-16
* hlintGravatar Joey Hess2012-09-13
* display errors when any named thread crashesGravatar Joey Hess2012-09-06
* cleanupGravatar Joey Hess2012-08-26
* refactorGravatar Joey Hess2012-08-22
* handle case of adding populated drive to just created repoGravatar Joey Hess2012-08-05
* build fixesGravatar Joey Hess2012-07-25
* debugging improvementsGravatar Joey Hess2012-07-20
* MVar deadlock problem seems to be fixed by previous commitGravatar Joey Hess2012-06-28
* improve thread termination handlingGravatar Joey Hess2012-06-28
* tweakGravatar Joey Hess2012-06-28
* merge conflict resolution now workingGravatar Joey Hess2012-06-27
* actually fetch from remote when doing a manual pullGravatar Joey Hess2012-06-27
* automatic conflict resolution for assistantGravatar Joey Hess2012-06-27
* fixup merges now done when neededGravatar Joey Hess2012-06-25
* reorg threadsGravatar Joey Hess2012-06-25
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-31 12:24:58 +0000