summaryrefslogtreecommitdiff
path: root/Assistant/Threads/Merger.hs
Commit message (Expand)AuthorAge
* sync: Pass --allow-unrelated-histories to git merge when used with git git 2....Gravatar Joey Hess2016-11-15
* move keys db closure to AutoMergeGravatar Joey Hess2016-05-16
* assistant: Fix race in v6 mode that caused downloaded file content to sometim...Gravatar Joey Hess2016-05-16
* assistant: Deal with upcoming git's refusal to merge unrelated histories by d...Gravatar Joey Hess2016-04-22
* make assistant aware of adjusted branches when mergingGravatar Joey Hess2016-02-29
* update my email address and homepage urlGravatar Joey Hess2015-01-21
* Really fix bug that caused the assistant to make many unncessary empty merge ...Gravatar Joey Hess2014-07-09
* assistant: Fix bug, introduced in last release, that caused the assistant to ...Gravatar Joey Hess2014-07-05
* support commit.gpgsignGravatar Joey Hess2014-07-04
* annex.startupscan can be set to false to disable the assistant's startup scan.Gravatar Joey Hess2014-03-05
* sync: Automatically resolve merge conflict between and annexed file and a reg...Gravatar Joey Hess2014-03-04
* factor out Annex.AutoMerge from Command.SyncGravatar Joey Hess2014-03-04
* remove Read instance for RefGravatar Joey Hess2014-02-19
* hlintGravatar Joey Hess2013-10-02
* assistant: Fix bug that could cause incoming pushes to not get merged into th...Gravatar Joey Hess2013-04-30
* let's put type modules under the parent module, not in a Types directoryGravatar Joey Hess2013-03-10
* tag xmpp pushes with jidGravatar Joey Hess2013-03-06
* assistant: Get back in sync with XMPP remotes after network reconnection, and...Gravatar Joey Hess2013-03-06
* add additional debug info about reasons for transfersGravatar Joey Hess2013-03-01
* webapp: Now allows restarting any threads that crash.Gravatar Joey Hess2013-01-26
* use sync command merge engine in assistantGravatar Joey Hess2012-12-25
* where indentationGravatar Joey Hess2012-10-31
* finished pushing Assistant monad into all relevant filesGravatar Joey Hess2012-10-30
* split BranchChange and liftedGravatar Joey Hess2012-10-29
* converted 6 more threadsGravatar Joey Hess2012-10-29
* Assistant monad, stage 2.5Gravatar Joey Hess2012-10-29
* add ConfigMonitor threadGravatar Joey Hess2012-10-20
* 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-11-01 07:45:57 +0000